Update obsolete api calls in .NET 6 (dotnet#1401)

DavoudEshtehari · DavoudEshtehari · commit 2fc7f1443d94 · 2022-01-13T13:21:58.000-08:00
diff --git a/doc/samples/AzureKeyVaultProviderExample.cs b/doc/samples/AzureKeyVaultProviderExample.cs
@@ -130,8 +130,8 @@ WITH VALUES (
         private static string GetEncryptedValue(SqlColumnEncryptionAzureKeyVaultProvider sqlColumnEncryptionAzureKeyVaultProvider)
         {
             byte[] plainTextColumnEncryptionKey = new byte[32];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(plainTextColumnEncryptionKey);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(plainTextColumnEncryptionKey);
 
             byte[] encryptedColumnEncryptionKey = sqlColumnEncryptionAzureKeyVaultProvider.EncryptColumnEncryptionKey(s_akvUrl, s_algorithm, plainTextColumnEncryptionKey);
             string EncryptedValue = string.Concat("0x", BitConverter.ToString(encryptedColumnEncryptionKey).Replace("-", string.Empty));
diff --git a/doc/samples/AzureKeyVaultProviderExample_2_0.cs b/doc/samples/AzureKeyVaultProviderExample_2_0.cs
@@ -118,8 +118,8 @@ WITH VALUES (
         private static string GetEncryptedValue(SqlColumnEncryptionAzureKeyVaultProvider sqlColumnEncryptionAzureKeyVaultProvider)
         {
             byte[] plainTextColumnEncryptionKey = new byte[32];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(plainTextColumnEncryptionKey);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(plainTextColumnEncryptionKey);
 
             byte[] encryptedColumnEncryptionKey = sqlColumnEncryptionAzureKeyVaultProvider.EncryptColumnEncryptionKey(s_akvUrl, s_algorithm, plainTextColumnEncryptionKey);
             string EncryptedValue = string.Concat("0x", BitConverter.ToString(encryptedColumnEncryptionKey).Replace("-", string.Empty));
diff --git a/doc/samples/AzureKeyVaultProviderLegacyExample_2_0.cs b/doc/samples/AzureKeyVaultProviderLegacyExample_2_0.cs
@@ -116,8 +116,8 @@ WITH VALUES (
         private static string GetEncryptedValue(SqlColumnEncryptionAzureKeyVaultProvider sqlColumnEncryptionAzureKeyVaultProvider)
         {
             byte[] plainTextColumnEncryptionKey = new byte[32];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(plainTextColumnEncryptionKey);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(plainTextColumnEncryptionKey);
 
             byte[] encryptedColumnEncryptionKey = sqlColumnEncryptionAzureKeyVaultProvider.EncryptColumnEncryptionKey(s_akvUrl, s_algorithm, plainTextColumnEncryptionKey);
             string EncryptedValue = string.Concat("0x", BitConverter.ToString(encryptedColumnEncryptionKey).Replace("-", string.Empty));
diff --git a/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs b/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs
@@ -136,8 +136,8 @@ WITH VALUES (
         private static string GetEncryptedValue(SqlColumnEncryptionAzureKeyVaultProvider sqlColumnEncryptionAzureKeyVaultProvider)
         {
             byte[] plainTextColumnEncryptionKey = new byte[32];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(plainTextColumnEncryptionKey);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(plainTextColumnEncryptionKey);
 
             byte[] encryptedColumnEncryptionKey = sqlColumnEncryptionAzureKeyVaultProvider.EncryptColumnEncryptionKey(s_akvUrl, s_algorithm, plainTextColumnEncryptionKey);
             string EncryptedValue = string.Concat("0x", BitConverter.ToString(encryptedColumnEncryptionKey).Replace("-", string.Empty));
diff --git a/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample_2_0.cs b/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample_2_0.cs
@@ -123,8 +123,8 @@ WITH VALUES (
         private static string GetEncryptedValue(SqlColumnEncryptionAzureKeyVaultProvider sqlColumnEncryptionAzureKeyVaultProvider)
         {
             byte[] plainTextColumnEncryptionKey = new byte[32];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(plainTextColumnEncryptionKey);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(plainTextColumnEncryptionKey);
 
             byte[] encryptedColumnEncryptionKey = sqlColumnEncryptionAzureKeyVaultProvider.EncryptColumnEncryptionKey(s_akvUrl, s_algorithm, plainTextColumnEncryptionKey);
             string EncryptedValue = string.Concat("0x", BitConverter.ToString(encryptedColumnEncryptionKey).Replace("-", string.Empty));
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs
@@ -151,7 +151,7 @@ protected void GetEnclaveSessionHelper(EnclaveSessionParameters enclaveSessionPa
                 {
                     if (shouldGenerateNonce)
                     {
-                        using (RandomNumberGenerator rng = new RNGCryptoServiceProvider())
+                        using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
                         {
                             // Client decides to initiate the process of attesting the enclave and to establish a secure session with the enclave.
                             // To ensure that server send new attestation request instead of replaying / re-sending the old token, we will create a nonce for current attestation request.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs
@@ -59,15 +59,14 @@ internal static string GetSHA256Hash(byte[] input)
         }
 
         /// <summary>
-        /// Generates cryptographicall random bytes
+        /// Generates cryptographically random bytes
         /// </summary>
         /// <param name="randomBytes">No of cryptographically random bytes to be generated</param>
         /// <returns>A byte array containing cryptographically generated random bytes</returns>
         internal static void GenerateRandomBytes(byte[] randomBytes)
         {
-            // Generate random bytes cryptographically.
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(randomBytes);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomBytes);
         }
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
@@ -95,8 +95,8 @@ internal static byte[] GenerateRandomBytes(int length)
         {
             // Generate random bytes cryptographically.
             byte[] randomBytes = new byte[length];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(randomBytes);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomBytes);
 
             return randomBytes;
         }
@@ -348,8 +348,9 @@ internal static byte[] DecryptDataUsingAED(byte[] encryptedCellBlob, byte[] key,
             return decryptedData;
         }
 
+#if NETFRAMEWORK
         /// <summary>
-        /// Create a self-signed certificate without private key. NET461 only.
+        /// Create a self-signed certificate without private key.
         /// </summary>
         internal static X509Certificate2 CreateCertificateWithNoPrivateKey()
         {
@@ -376,6 +377,7 @@ internal static X509Certificate2 CreateCertificateWithNoPrivateKey()
 
             return certificate;
         }
+#endif
 
         /// <summary>
         /// Gets hex representation of byte array.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
@@ -218,7 +218,7 @@ public void AkvStoreProviderVerifyFunctionWithInvalidSignature(bool fEnclaveEnab
             Buffer.BlockCopy(cmkSignature, 0, tamperedCmkSignature, 0, tamperedCmkSignature.Length);
 
             // Corrupt one byte at a time 10 times
-            RandomNumberGenerator rng = new RNGCryptoServiceProvider();
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
             byte[] randomIndexInCipherText = new byte[1];
             for (int i = 0; i < 10; i++)
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/DatabaseHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/DatabaseHelper.cs
@@ -174,8 +174,8 @@ internal static byte[] GenerateRandomBytes(int length)
         {
             // Generate random bytes cryptographically.
             byte[] randomBytes = new byte[length];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(randomBytes);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomBytes);
             return randomBytes;
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/CertificateUtilityWin.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/CertificateUtilityWin.cs
@@ -188,7 +188,7 @@ internal static X509Certificate2 GetCertificate(string certificateName, StoreLoc
         /// </summary>
         internal static string GetCspPathFromCertificate(X509Certificate2 certificate)
         {
-            if (certificate.PrivateKey is RSACryptoServiceProvider csp)
+            if (certificate.GetRSAPrivateKey() is RSACryptoServiceProvider csp)
             {
                 return string.Concat(csp.CspKeyContainerInfo.ProviderName, @"/", csp.CspKeyContainerInfo.KeyContainerName);
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnEncryptionKey.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnEncryptionKey.cs
@@ -60,8 +60,8 @@ public static byte[] GenerateRandomBytes(int length)
         {
             // Generate random bytes cryptographically.
             byte[] randomBytes = new byte[length];
-            RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();
-            rngCsp.GetBytes(randomBytes);
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomBytes);
 
             return randomBytes;
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs
@@ -739,11 +739,8 @@ protected virtual TDSMessageCollection CheckTDSVersion(ITDSServerSession session
         private byte[] _GenerateRandomBytes(int count)
         {
             byte[] randomBytes = new byte[count];
-
-            RNGCryptoServiceProvider gen = new RNGCryptoServiceProvider();
-            // Generate bytes
-            gen.GetBytes(randomBytes);
-
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomBytes);
             return randomBytes;
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/Login7/TDSLogin7FedAuthOptionToken.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/Login7/TDSLogin7FedAuthOptionToken.cs
@@ -366,11 +366,8 @@ private bool ReadSecurityTokenLogin(Stream source, uint optionDataLength)
         private byte[] _GenerateRandomBytes(int count)
         {
             byte[] randomBytes = new byte[count];
-
-            RNGCryptoServiceProvider gen = new RNGCryptoServiceProvider();
-            // Generate bytes
-            gen.GetBytes(randomBytes);
-
+            RandomNumberGenerator rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomBytes);
             return randomBytes;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ protected void GetEnclaveSessionHelper(EnclaveSessionParameters enclaveSessionPa`
`151`	`151`	`{`
`152`	`152`	`if (shouldGenerateNonce)`
`153`	`153`	`{`
`154`		`- using (RandomNumberGenerator rng = new RNGCryptoServiceProvider())`
	`154`	`+ using (RandomNumberGenerator rng = RandomNumberGenerator.Create())`
`155`	`155`	`{`
`156`	`156`	`// Client decides to initiate the process of attesting the enclave and to establish a secure session with the enclave.`
`157`	`157`	`// To ensure that server send new attestation request instead of replaying / re-sending the old token, we will create a nonce for current attestation request.`
Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,14 @@ internal static string GetSHA256Hash(byte[] input)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/// <summary>`
`62`		`- /// Generates cryptographicall random bytes`
	`62`	`+ /// Generates cryptographically random bytes`
`63`	`63`	`/// </summary>`
`64`	`64`	`/// <param name="randomBytes">No of cryptographically random bytes to be generated</param>`
`65`	`65`	`/// <returns>A byte array containing cryptographically generated random bytes</returns>`
`66`	`66`	`internal static void GenerateRandomBytes(byte[] randomBytes)`
`67`	`67`	`{`
`68`		`- // Generate random bytes cryptographically.`
`69`		`- RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();`
`70`		`- rngCsp.GetBytes(randomBytes);`
	`68`	`+ RandomNumberGenerator rng = RandomNumberGenerator.Create();`
	`69`	`+ rng.GetBytes(randomBytes);`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ internal static byte[] GenerateRandomBytes(int length)`
`95`	`95`	`{`
`96`	`96`	`// Generate random bytes cryptographically.`
`97`	`97`	`byte[] randomBytes = new byte[length];`
`98`		`- RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();`
`99`		`- rngCsp.GetBytes(randomBytes);`
	`98`	`+ RandomNumberGenerator rng = RandomNumberGenerator.Create();`
	`99`	`+ rng.GetBytes(randomBytes);`
`100`	`100`
`101`	`101`	`return randomBytes;`
`102`	`102`	`}`
`@@ -348,8 +348,9 @@ internal static byte[] DecryptDataUsingAED(byte[] encryptedCellBlob, byte[] key,`
`348`	`348`	`return decryptedData;`
`349`	`349`	`}`
`350`	`350`
	`351`	`+#if NETFRAMEWORK`
`351`	`352`	`/// <summary>`
`352`		`- /// Create a self-signed certificate without private key. NET461 only.`
	`353`	`+ /// Create a self-signed certificate without private key.`
`353`	`354`	`/// </summary>`
`354`	`355`	`internal static X509Certificate2 CreateCertificateWithNoPrivateKey()`
`355`	`356`	`{`
`@@ -376,6 +377,7 @@ internal static X509Certificate2 CreateCertificateWithNoPrivateKey()`
`376`	`377`
`377`	`378`	`return certificate;`
`378`	`379`	`}`
	`380`	`+#endif`
`379`	`381`
`380`	`382`	`/// <summary>`
`381`	`383`	`/// Gets hex representation of byte array.`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public void AkvStoreProviderVerifyFunctionWithInvalidSignature(bool fEnclaveEnab`
`218`	`218`	`Buffer.BlockCopy(cmkSignature, 0, tamperedCmkSignature, 0, tamperedCmkSignature.Length);`
`219`	`219`
`220`	`220`	`// Corrupt one byte at a time 10 times`
`221`		`- RandomNumberGenerator rng = new RNGCryptoServiceProvider();`
	`221`	`+ RandomNumberGenerator rng = RandomNumberGenerator.Create();`
`222`	`222`	`byte[] randomIndexInCipherText = new byte[1];`
`223`	`223`	`for (int i = 0; i < 10; i++)`
`224`	`224`	`{`
Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,8 @@ internal static byte[] GenerateRandomBytes(int length)`
`174`	`174`	`{`
`175`	`175`	`// Generate random bytes cryptographically.`
`176`	`176`	`byte[] randomBytes = new byte[length];`
`177`		`- RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider();`
`178`		`- rngCsp.GetBytes(randomBytes);`
	`177`	`+ RandomNumberGenerator rng = RandomNumberGenerator.Create();`
	`178`	`+ rng.GetBytes(randomBytes);`
`179`	`179`	`return randomBytes;`
`180`	`180`	`}`
`181`	`181`