From 4ed1c1500fad35518ecec0cd4cf4b4472189907f Mon Sep 17 00:00:00 2001
From: Angel Garbarino <Monkeychip@users.noreply.github.com>
Date: Wed, 12 Aug 2020 08:49:24 -0600
Subject: [PATCH] UI Transit: Add missed algorithms (#9070) (#9723)

Co-authored-by: Noelle Daley <noelledaley@users.noreply.github.com>

Co-authored-by: Mark <binlab@users.noreply.github.com>
Co-authored-by: Noelle Daley <noelledaley@users.noreply.github.com>
---
 .../partials/transit-form-create.hbs          | 11 +++++++++
 ui/tests/acceptance/transit-test.js           | 24 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/ui/app/templates/partials/transit-form-create.hbs b/ui/app/templates/partials/transit-form-create.hbs
index 72d85aceaa79..fd62c9cf4fca 100644
--- a/ui/app/templates/partials/transit-form-create.hbs
+++ b/ui/app/templates/partials/transit-form-create.hbs
@@ -16,6 +16,9 @@
             onchange={{action (mut key.type) value="target.value"}}
             data-test-transit-key-type=true
           >
+            <option selected={{eq key.type "aes128-gcm96"}} value="aes128-gcm96">
+              aes128-gcm96
+            </option>
             <option selected={{eq key.type "aes256-gcm96"}} value="aes256-gcm96">
               aes256-gcm96
             </option>
@@ -25,6 +28,12 @@
             <option selected={{eq key.type "ecdsa-p256"}} value="ecdsa-p256">
               ecdsa-p256
             </option>
+            <option selected={{eq key.type "ecdsa-p384"}} value="ecdsa-p384">
+              ecdsa-p384
+            </option>
+            <option selected={{eq key.type "ecdsa-p521"}} value="ecdsa-p521">
+              ecdsa-p521
+            </option>
             <option selected={{eq key.type "ed25519"}} value="ed25519">
               ed25519
             </option>
@@ -56,6 +65,7 @@
       </div>
     </div>
     {{#if (or
+        (eq key.type "aes128-gcm96")
         (eq key.type "aes256-gcm96")
         (eq key.type "chacha20-poly1305")
         (eq key.type "ed25519")
@@ -77,6 +87,7 @@
       </div>
     {{/if}}
     {{#if (or
+        (eq key.type "aes128-gcm96")
         (eq key.type "aes256-gcm96")
         (eq key.type "chacha20-poly1305")
       )
diff --git a/ui/tests/acceptance/transit-test.js b/ui/tests/acceptance/transit-test.js
index b13b623088b4..9a13189eabd8 100644
--- a/ui/tests/acceptance/transit-test.js
+++ b/ui/tests/acceptance/transit-test.js
@@ -7,6 +7,18 @@ import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
 import secretListPage from 'vault/tests/pages/secrets/backend/list';
 
 const keyTypes = [
+  {
+    name: ts => `aes-${ts}`,
+    type: 'aes128-gcm96',
+    exportable: true,
+    supportsEncryption: true,
+  },
+  {
+    name: ts => `aes-convergent-${ts}`,
+    type: 'aes128-gcm96',
+    convergent: true,
+    supportsEncryption: true,
+  },
   {
     name: ts => `aes-${ts}`,
     type: 'aes256-gcm96',
@@ -37,6 +49,18 @@ const keyTypes = [
     exportable: true,
     supportsSigning: true,
   },
+  {
+    name: ts => `ecdsa-${ts}`,
+    type: 'ecdsa-p384',
+    exportable: true,
+    supportsSigning: true,
+  },
+  {
+    name: ts => `ecdsa-${ts}`,
+    type: 'ecdsa-p521',
+    exportable: true,
+    supportsSigning: true,
+  },
   {
     name: ts => `ed25519-${ts}`,
     type: 'ed25519',