Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI/transit add missed algorithms follow up #9520

Merged
merged 3 commits into from
Jul 17, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ui/app/serializers/transit-key.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ export default DS.RESTSerializer.extend({
assign(payload, payload.data);
delete payload.data;
// timestamps for these two are in seconds...
if (payload.type === 'aes256-gcm96' || payload.type === 'chacha20-poly1305') {
if (
payload.type === 'aes256-gcm96' ||
payload.type === 'chacha20-poly1305' ||
payload.type === 'aes128-gcm96'
) {
for (let version in payload.keys) {
payload.keys[version] = payload.keys[version] * 1000;
}
Expand Down
1 change: 1 addition & 0 deletions ui/app/templates/partials/transit-form-show.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
{{#if (or
(eq key.type "aes256-gcm96")
(eq key.type "chacha20-poly1305")
(eq key.type "aes128-gcm96")
)
}}
{{#each-in key.keys as |version creationTimestamp|}}
Expand Down