Skip to content

Commit e0e5e1b

Browse files
JonathanCrdjsquire
andauthored
[KeyVault] Add support for 7.6 preview.2 in Keys (Azure#48817)
* Bring KeyVault.Keys changes from PR Azure#48675 * Add Attestation as a Key property * Test attestation with HSM * record new tests * Fix issues to solve live tests failures * Apply suggestions from code review Co-authored-by: Jesse Squire <[email protected]> * Resolving comments * Record tests * Fix error in XML comment * Export API * Ignore Hmac algorithms in the Local client for Beta * Update recordings and Ignore Local Crypto tests for Hmac algorithms for Beta * Comment RecordedTestMode * Update certs tests recordings * Split algorithms between regular KV and ManagedHSM and record tests again * Remove unintentional exclusion of Hmac algorithms for ManagedHSM test --------- Co-authored-by: Jesse Squire <[email protected]>
1 parent 8f3ed98 commit e0e5e1b

23 files changed

+458
-25
lines changed

sdk/keyvault/Azure.Security.KeyVault.Certificates/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "net",
44
"TagPrefix": "net/keyvault/Azure.Security.KeyVault.Certificates",
5-
"Tag": "net/keyvault/Azure.Security.KeyVault.Certificates_99d69ef506"
5+
"Tag": "net/keyvault/Azure.Security.KeyVault.Certificates_4f83772441"
66
}

sdk/keyvault/Azure.Security.KeyVault.Keys/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
### Other Changes
1212

13+
- The default service version is now "7.6-preview.2".
14+
1315
## 4.7.0 (2024-10-14)
1416

1517
### Features Added

sdk/keyvault/Azure.Security.KeyVault.Keys/api/Azure.Security.KeyVault.Keys.net8.0.cs

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ public JsonWebKey(System.Security.Cryptography.RSA rsaProvider, bool includePriv
103103
public System.Security.Cryptography.ECDsa ToECDsa(bool includePrivateParameters = false) { throw null; }
104104
public System.Security.Cryptography.RSA ToRSA(bool includePrivateParameters = false) { throw null; }
105105
}
106+
public partial class KeyAttestation
107+
{
108+
public KeyAttestation() { }
109+
public byte[] CertificatePemFile { get { throw null; } set { } }
110+
public byte[] PrivateKeyAttestation { get { throw null; } set { } }
111+
public byte[] PublicKeyAttestation { get { throw null; } set { } }
112+
public string Version { get { throw null; } set { } }
113+
}
106114
public partial class KeyClient
107115
{
108116
protected KeyClient() { }
@@ -126,6 +134,8 @@ public KeyClient(System.Uri vaultUri, Azure.Core.TokenCredential credential, Azu
126134
public virtual Azure.AsyncPageable<Azure.Security.KeyVault.Keys.DeletedKey> GetDeletedKeysAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
127135
public virtual Azure.Response<Azure.Security.KeyVault.Keys.KeyVaultKey> GetKey(string name, string version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
128136
public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Security.KeyVault.Keys.KeyVaultKey>> GetKeyAsync(string name, string version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
137+
public virtual Azure.Response<Azure.Security.KeyVault.Keys.KeyVaultKey> GetKeyAttestation(string name, string version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
138+
public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Security.KeyVault.Keys.KeyVaultKey>> GetKeyAttestationAsync(string name, string version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
129139
public virtual Azure.Response<Azure.Security.KeyVault.Keys.KeyRotationPolicy> GetKeyRotationPolicy(string keyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
130140
public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Security.KeyVault.Keys.KeyRotationPolicy>> GetKeyRotationPolicyAsync(string keyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
131141
public virtual Azure.Pageable<Azure.Security.KeyVault.Keys.KeyProperties> GetPropertiesOfKeys(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -159,7 +169,7 @@ public KeyClient(System.Uri vaultUri, Azure.Core.TokenCredential credential, Azu
159169
}
160170
public partial class KeyClientOptions : Azure.Core.ClientOptions
161171
{
162-
public KeyClientOptions(Azure.Security.KeyVault.Keys.KeyClientOptions.ServiceVersion version = Azure.Security.KeyVault.Keys.KeyClientOptions.ServiceVersion.V7_5) { }
172+
public KeyClientOptions(Azure.Security.KeyVault.Keys.KeyClientOptions.ServiceVersion version = Azure.Security.KeyVault.Keys.KeyClientOptions.ServiceVersion.V7_6_Preview_2) { }
163173
public bool DisableChallengeResourceVerification { get { throw null; } set { } }
164174
public Azure.Security.KeyVault.Keys.KeyClientOptions.ServiceVersion Version { get { throw null; } }
165175
public enum ServiceVersion
@@ -170,6 +180,7 @@ public enum ServiceVersion
170180
V7_3 = 3,
171181
V7_4 = 4,
172182
V7_5 = 5,
183+
V7_6_Preview_2 = 6,
173184
}
174185
}
175186
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -249,6 +260,7 @@ public partial class KeyProperties
249260
{
250261
public KeyProperties(string name) { }
251262
public KeyProperties(System.Uri id) { }
263+
public Azure.Security.KeyVault.Keys.KeyAttestation Attestation { get { throw null; } }
252264
public System.DateTimeOffset? CreatedOn { get { throw null; } }
253265
public bool? Enabled { get { throw null; } set { } }
254266
public System.DateTimeOffset? ExpiresOn { get { throw null; } set { } }
@@ -429,7 +441,7 @@ public CryptographyClient(System.Uri keyId, Azure.Core.TokenCredential credentia
429441
}
430442
public partial class CryptographyClientOptions : Azure.Core.ClientOptions
431443
{
432-
public CryptographyClientOptions(Azure.Security.KeyVault.Keys.Cryptography.CryptographyClientOptions.ServiceVersion version = Azure.Security.KeyVault.Keys.Cryptography.CryptographyClientOptions.ServiceVersion.V7_5) { }
444+
public CryptographyClientOptions(Azure.Security.KeyVault.Keys.Cryptography.CryptographyClientOptions.ServiceVersion version = Azure.Security.KeyVault.Keys.Cryptography.CryptographyClientOptions.ServiceVersion.V7_6_Preview_2) { }
433445
public bool DisableChallengeResourceVerification { get { throw null; } set { } }
434446
public Azure.Security.KeyVault.Keys.Cryptography.CryptographyClientOptions.ServiceVersion Version { get { throw null; } }
435447
public enum ServiceVersion
@@ -440,6 +452,7 @@ public enum ServiceVersion
440452
V7_3 = 3,
441453
V7_4 = 4,
442454
V7_5 = 5,
455+
V7_6_Preview_2 = 6,
443456
}
444457
}
445458
public partial class DecryptParameters
@@ -459,6 +472,8 @@ internal DecryptParameters() { }
459472
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters A256CbcPadParameters(byte[] ciphertext, byte[] iv) { throw null; }
460473
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters A256CbcParameters(byte[] ciphertext, byte[] iv) { throw null; }
461474
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters A256GcmParameters(byte[] ciphertext, byte[] iv, byte[] authenticationTag, byte[] additionalAuthenticatedData = null) { throw null; }
475+
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters CkmAesKeyWrapPadParameters(byte[] ciphertext, byte[] iv) { throw null; }
476+
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters CkmAesKeyWrapParameters(byte[] ciphertext, byte[] iv) { throw null; }
462477
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters Rsa15Parameters(byte[] ciphertext) { throw null; }
463478
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters RsaOaep256Parameters(byte[] ciphertext) { throw null; }
464479
public static Azure.Security.KeyVault.Keys.Cryptography.DecryptParameters RsaOaepParameters(byte[] ciphertext) { throw null; }
@@ -485,6 +500,8 @@ internal DecryptResult() { }
485500
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm A256Cbc { get { throw null; } }
486501
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm A256CbcPad { get { throw null; } }
487502
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm A256Gcm { get { throw null; } }
503+
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm CkmAesKeyWrap { get { throw null; } }
504+
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm CkmAesKeyWrapPad { get { throw null; } }
488505
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm Rsa15 { get { throw null; } }
489506
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm RsaOaep { get { throw null; } }
490507
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptionAlgorithm RsaOaep256 { get { throw null; } }
@@ -514,6 +531,8 @@ internal EncryptParameters() { }
514531
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters A256CbcPadParameters(byte[] plaintext, byte[] iv = null) { throw null; }
515532
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters A256CbcParameters(byte[] plaintext, byte[] iv = null) { throw null; }
516533
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters A256GcmParameters(byte[] plaintext, byte[] additionalAuthenticatedData = null) { throw null; }
534+
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters CkmAesKeyWrapPadParameters(byte[] plaintext, byte[] iv = null) { throw null; }
535+
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters CkmAesKeyWrapParameters(byte[] plaintext, byte[] iv = null) { throw null; }
517536
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters Rsa15Parameters(byte[] plaintext) { throw null; }
518537
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters RsaOaep256Parameters(byte[] plaintext) { throw null; }
519538
public static Azure.Security.KeyVault.Keys.Cryptography.EncryptParameters RsaOaepParameters(byte[] plaintext) { throw null; }
@@ -593,6 +612,9 @@ public override void ImportParameters(System.Security.Cryptography.RSAParameters
593612
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm ES256K { get { throw null; } }
594613
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm ES384 { get { throw null; } }
595614
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm ES512 { get { throw null; } }
615+
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm HS256 { get { throw null; } }
616+
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm HS384 { get { throw null; } }
617+
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm HS512 { get { throw null; } }
596618
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm PS256 { get { throw null; } }
597619
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm PS384 { get { throw null; } }
598620
public static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm PS512 { get { throw null; } }

0 commit comments

Comments
 (0)