From af953ba6e23b3b9088bed236bb02426ea7730ceb Mon Sep 17 00:00:00 2001 From: David Desberg Date: Fri, 18 May 2018 12:15:27 -0700 Subject: [PATCH 1/4] fix typos --- .../data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json | 4 ++-- .../Microsoft.KeyVault/stable/2015-06-01/keyvault.json | 4 ++-- .../Microsoft.KeyVault/stable/2016-10-01/keyvault.json | 4 ++-- 3 files changed, 6 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 ab0622af9622..8777e9499b48 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 @@ -4364,7 +4364,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; 1024 or 2048." }, "reuse_key": { "type": "boolean", @@ -4662,7 +4662,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, 1024 or 2048." }, "key_ops": { "type": "array", diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2015-06-01/keyvault.json b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2015-06-01/keyvault.json index 2b02f460cd05..46802fea6fdd 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2015-06-01/keyvault.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/2015-06-01/keyvault.json @@ -2246,7 +2246,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bytes. e.g. 2048." + "description": "The key size in bits. e.g. 2048." }, "reuse_key": { "type": "boolean", @@ -2539,7 +2539,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bytes. e.g. 1024 or 2048." + "description": "The key size in bits. e.g. 1024 or 2048." }, "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 d5899637e785..d6d30ba98f7b 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 @@ -3565,7 +3565,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; 1024 or 2048." }, "reuse_key": { "type": "boolean", @@ -3858,7 +3858,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, 1024 or 2048." }, "key_ops": { "type": "array", From a25ece6dace707b3601091b69e2ea27564089941 Mon Sep 17 00:00:00 2001 From: David Desberg Date: Tue, 22 May 2018 13:17:14 -0700 Subject: [PATCH 2/4] 3072 and 4096 are valid rsa key sizes --- .../data-plane/Microsoft.KeyVault/preview/7.0/keyvault.json | 4 ++-- .../Microsoft.KeyVault/stable/2016-10-01/keyvault.json | 4 ++-- 2 files changed, 4 insertions(+), 4 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 8777e9499b48..8568e32d3aef 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 @@ -4364,7 +4364,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example; 1024 or 2048." + "description": "The key size in bits. For example: 1024, 2048, 3072, or 4096 for RSA." }, "reuse_key": { "type": "boolean", @@ -4662,7 +4662,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example, 1024 or 2048." + "description": "The key size in bits. For example: 1024, 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 d6d30ba98f7b..096f5eb86edd 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 @@ -3565,7 +3565,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example; 1024 or 2048." + "description": "The key size in bits. For example: 1024, 2048, 3072, or 4096 for RSA." }, "reuse_key": { "type": "boolean", @@ -3858,7 +3858,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example, 1024 or 2048." + "description": "The key size in bits. For example: 1024, 2048, 3072, or 4096 for RSA." }, "key_ops": { "type": "array", From 5b0a6897fa6451ae191fba8ca15c5d5df66ea6fb Mon Sep 17 00:00:00 2001 From: David Desberg Date: Wed, 23 May 2018 13:37:29 -0700 Subject: [PATCH 3/4] add 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 8568e32d3aef..24b6ee7711d6 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 @@ -3798,7 +3798,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." + }, + { + "value": "P-384", + "description": "The NIST P-384 elliptic curve." + }, + { + "value": "P-521", + "description": "The NIST P-521 elliptic curve." + }, + { + "value": "SECP256K1", + "description": "The SECP256K1 elliptic curve." + } + ] } }, "x": { @@ -4364,7 +4382,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example: 1024, 2048, 3072, or 4096 for RSA." + "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA." }, "reuse_key": { "type": "boolean", @@ -4662,7 +4680,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example: 1024, 2048, 3072, or 4096 for RSA." + "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 096f5eb86edd..b94db774ad96 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." + }, + { + "value": "P-384", + "description": "The NIST P-384 elliptic curve." + }, + { + "value": "P-521", + "description": "The NIST P-521 elliptic curve." + }, + { + "value": "SECP256K1", + "description": "The SECP256K1 elliptic curve." + } + ] } }, "x": { @@ -3565,7 +3583,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example: 1024, 2048, 3072, or 4096 for RSA." + "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA." }, "reuse_key": { "type": "boolean", @@ -3858,7 +3876,7 @@ "key_size": { "type": "integer", "format": "int32", - "description": "The key size in bits. For example: 1024, 2048, 3072, or 4096 for RSA." + "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA." }, "key_ops": { "type": "array", From c33b76fa7777a0327b9f884b44e0433c0abdb0e1 Mon Sep 17 00:00:00 2001 From: David Desberg Date: Wed, 23 May 2018 13:42:25 -0700 Subject: [PATCH 4/4] Tweak ec descriptions --- .../Microsoft.KeyVault/preview/7.0/keyvault.json | 8 ++++---- .../Microsoft.KeyVault/stable/2016-10-01/keyvault.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 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 24b6ee7711d6..af5498a47b3c 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 @@ -3802,19 +3802,19 @@ "values": [ { "value": "P-256", - "description": "The NIST P-256 elliptic curve." + "description": "The NIST P-256 elliptic curve, AKA SECG curve SECP256R1." }, { "value": "P-384", - "description": "The NIST P-384 elliptic curve." + "description": "The NIST P-384 elliptic curve, AKA SECG curve SECP384R1." }, { "value": "P-521", - "description": "The NIST P-521 elliptic curve." + "description": "The NIST P-521 elliptic curve, AKA SECG curve SECP521R1." }, { "value": "SECP256K1", - "description": "The SECP256K1 elliptic curve." + "description": "The SECG SECP256K1 elliptic curve." } ] } 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 b94db774ad96..5599ee317073 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 @@ -3015,19 +3015,19 @@ "values": [ { "value": "P-256", - "description": "The NIST P-256 elliptic curve." + "description": "The NIST P-256 elliptic curve, AKA SECG curve SECP256R1." }, { "value": "P-384", - "description": "The NIST P-384 elliptic curve." + "description": "The NIST P-384 elliptic curve, AKA SECG curve SECP384R1." }, { "value": "P-521", - "description": "The NIST P-521 elliptic curve." + "description": "The NIST P-521 elliptic curve, AKA SECG curve SECP521R1." }, { "value": "SECP256K1", - "description": "The SECP256K1 elliptic curve." + "description": "The SECG SECP256K1 elliptic curve." } ] }