From 0065474e218d79f7c4d21613435f43544a265651 Mon Sep 17 00:00:00 2001
From: David Desberg <david@daviddesberg.com>
Date: Wed, 23 May 2018 14:59:17 -0700
Subject: [PATCH 1/2] RSA key size examples, ECC descriptions

---
 .../preview/7.0/keyvault.json                 | 24 ++++++++++++++++---
 .../stable/2016-10-01/keyvault.json           | 24 ++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json
index 34179af4101f..8e026e43d038 100644
--- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json
+++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json
@@ -3419,7 +3419,25 @@
           "enum": [ "P-256", "P-384", "P-521", "SECP256K1" ],
           "x-ms-enum": {
             "name": "JsonWebKeyCurveName",
-            "modelAsString": true
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "P-256",
+                "description": "The NIST P-256 elliptic curve, AKA SECG curve SECP256R1."
+              },
+              {
+                "value": "P-384",
+                "description": "The NIST P-384 elliptic curve, AKA SECG curve SECP384R1."
+              },
+              {
+                "value": "P-521",
+                "description": "The NIST P-521 elliptic curve, AKA SECG curve SECP521R1."
+              },
+              {
+                "value": "SECP256K1",
+                "description": "The SECG SECP256K1 elliptic curve."
+              }
+            ]
           }
         },
         "x": {
@@ -3985,7 +4003,7 @@
         "key_size": {
           "type": "integer",
           "format": "int32",
-          "description": "The key size in bytes. For example;  1024 or 2048."
+          "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA."
         },
         "reuse_key": {
           "type": "boolean",
@@ -4278,7 +4296,7 @@
         "key_size": {
           "type": "integer",
           "format": "int32",
-          "description": "The key size in bytes. For example, 1024 or 2048."
+          "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA."
         },
         "key_ops": {
           "type": "array",
diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2016-10-01/keyvault.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2016-10-01/keyvault.json
index 2d30601eb9b8..c966bc6e254e 100644
--- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2016-10-01/keyvault.json
+++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2016-10-01/keyvault.json
@@ -3011,7 +3011,25 @@
           "enum": [ "P-256", "P-384", "P-521", "SECP256K1" ],
           "x-ms-enum": {
             "name": "JsonWebKeyCurveName",
-            "modelAsString": true
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "P-256",
+                "description": "The NIST P-256 elliptic curve, AKA SECG curve SECP256R1."
+              },
+              {
+                "value": "P-384",
+                "description": "The NIST P-384 elliptic curve, AKA SECG curve SECP384R1."
+              },
+              {
+                "value": "P-521",
+                "description": "The NIST P-521 elliptic curve, AKA SECG curve SECP521R1."
+              },
+              {
+                "value": "SECP256K1",
+                "description": "The SECG SECP256K1 elliptic curve."
+              }
+            ]
           }
         },
         "x": {
@@ -3583,7 +3601,7 @@
         "key_size": {
           "type": "integer",
           "format": "int32",
-          "description": "The key size in bytes. For example;  1024 or 2048."
+          "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA."
         },
         "reuse_key": {
           "type": "boolean",
@@ -3876,7 +3894,7 @@
         "key_size": {
           "type": "integer",
           "format": "int32",
-          "description": "The key size in bytes. For example, 1024 or 2048."
+          "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA."
         },
         "key_ops": {
           "type": "array",

From e845a4082da9b82a6ec07bf51c7c4d9b942c09a7 Mon Sep 17 00:00:00 2001
From: David Desberg <david.desberg@microsoft.com>
Date: Thu, 24 May 2018 17:16:54 -0700
Subject: [PATCH 2/2] remove preview changes for now

---
 .../preview/7.0/keyvault.json                 | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json
index 8e026e43d038..34179af4101f 100644
--- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json
+++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json
@@ -3419,25 +3419,7 @@
           "enum": [ "P-256", "P-384", "P-521", "SECP256K1" ],
           "x-ms-enum": {
             "name": "JsonWebKeyCurveName",
-            "modelAsString": true,
-            "values": [
-              {
-                "value": "P-256",
-                "description": "The NIST P-256 elliptic curve, AKA SECG curve SECP256R1."
-              },
-              {
-                "value": "P-384",
-                "description": "The NIST P-384 elliptic curve, AKA SECG curve SECP384R1."
-              },
-              {
-                "value": "P-521",
-                "description": "The NIST P-521 elliptic curve, AKA SECG curve SECP521R1."
-              },
-              {
-                "value": "SECP256K1",
-                "description": "The SECG SECP256K1 elliptic curve."
-              }
-            ]
+            "modelAsString": true
           }
         },
         "x": {
@@ -4003,7 +3985,7 @@
         "key_size": {
           "type": "integer",
           "format": "int32",
-          "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA."
+          "description": "The key size in bytes. For example;  1024 or 2048."
         },
         "reuse_key": {
           "type": "boolean",
@@ -4296,7 +4278,7 @@
         "key_size": {
           "type": "integer",
           "format": "int32",
-          "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA."
+          "description": "The key size in bytes. For example, 1024 or 2048."
         },
         "key_ops": {
           "type": "array",