From 8eaf33279918c13a6f4ec2215cd3312479025f0b Mon Sep 17 00:00:00 2001
From: Alexander Schmidt <aschmidt@microsoft.com>
Date: Tue, 7 Sep 2021 15:05:55 -0700
Subject: [PATCH] Add OKP key type and EdDSA digital signature

---
 .../preview/7.3-preview/keys.json             | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json
index 683e717b54db..07061ae17195 100644
--- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json
+++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.3-preview/keys.json
@@ -1323,7 +1323,9 @@
             "RSA",
             "RSA-HSM",
             "oct",
-            "oct-HSM"
+            "oct-HSM",
+            "OKP",
+            "OKP-HSM"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeyType",
@@ -1352,6 +1354,14 @@
               {
                 "value": "oct-HSM",
                 "description": "Octet sequence (used to represent symmetric keys) which is stored the HSM."
+              },
+              {
+                "value": "OKP",
+                "description": "Octet key pair (https://tools.ietf.org/html/rfc8037)"
+              },
+              {
+                "value": "OKP-HSM",
+                "description": "Octet key pair (https://tools.ietf.org/html/rfc8037) with a private key which is stored in the HSM."
               }
             ]
           }
@@ -1376,7 +1386,7 @@
         "d": {
           "type": "string",
           "format": "base64url",
-          "description": "RSA private exponent, or the D component of an EC private key."
+          "description": "RSA private exponent, or the D component of an EC or OKP private key."
         },
         "dp": {
           "x-ms-client-name": "DP",
@@ -1424,7 +1434,8 @@
             "P-256",
             "P-384",
             "P-521",
-            "P-256K"
+            "P-256K",
+            "Ed25519"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeyCurveName",
@@ -1445,6 +1456,10 @@
               {
                 "value": "P-256K",
                 "description": "The SECG SECP256K1 elliptic curve."
+              },
+              {
+                "value": "Ed25519",
+                "description": "The Ed25519 Edwards-curve."
               }
             ]
           }
@@ -1452,7 +1467,7 @@
         "x": {
           "type": "string",
           "format": "base64url",
-          "description": "X component of an EC public key."
+          "description": "X component of an EC or OKP public key."
         },
         "y": {
           "type": "string",
@@ -1654,7 +1669,9 @@
             "RSA",
             "RSA-HSM",
             "oct",
-            "oct-HSM"
+            "oct-HSM",
+            "OKP",
+            "OKP-HSM"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeyType",
@@ -1678,7 +1695,8 @@
             "P-256",
             "P-384",
             "P-521",
-            "P-256K"
+            "P-256K",
+            "Ed25519"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeyCurveName",
@@ -1700,7 +1718,9 @@
             "RSA",
             "RSA-HSM",
             "oct",
-            "oct-HSM"
+            "oct-HSM",
+            "OKP",
+            "OKP-HSM"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeyType",
@@ -1757,7 +1777,8 @@
             "P-256",
             "P-384",
             "P-521",
-            "P-256K"
+            "P-256K",
+            "Ed25519"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeyCurveName",
@@ -1939,7 +1960,8 @@
             "ES256",
             "ES384",
             "ES512",
-            "ES256K"
+            "ES256K",
+            "EdDSA"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeySignatureAlgorithm",
@@ -1988,6 +2010,10 @@
               {
                 "value": "ES256K",
                 "description": "ECDSA using P-256K and SHA-256, as described in https://tools.ietf.org/html/rfc7518"
+              },
+              {
+                "value": "EdDSA",
+                "description": "Edwards-curve digital signature, as described in https://tools.ietf.org/html/rfc8032."
               }
             ]
           }
@@ -2021,7 +2047,8 @@
             "ES256",
             "ES384",
             "ES512",
-            "ES256K"
+            "ES256K",
+            "EdDSA"
           ],
           "x-ms-enum": {
             "name": "JsonWebKeySignatureAlgorithm",