macOS issue when handling a certificate without a private key.

edwardneal · edwardneal · commit bc78faed7d4d · 2024-11-19T21:10:14.000Z
Eliminating possibility of a certificate with a private key having been previously added to the user certificate store.
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
@@ -363,10 +363,11 @@ internal static X509Certificate2 CreateCertificateWithNoPrivateKey()
             {
                 certStore = new X509Store(StoreName.My, StoreLocation.CurrentUser);
                 certStore.Open(OpenFlags.ReadWrite);
-                if (!certStore.Certificates.Contains(publicKey))
+                if (certStore.Certificates.Contains(publicKey))
                 {
-                    certStore.Add(publicKey);
+                    certStore.Remove(publicKey);
                 }
+                certStore.Add(publicKey);
             }
             finally
             {

Original file line number	Diff line number	Diff line change
`@@ -363,10 +363,11 @@ internal static X509Certificate2 CreateCertificateWithNoPrivateKey()`
`363`	`363`	`{`
`364`	`364`	`certStore = new X509Store(StoreName.My, StoreLocation.CurrentUser);`
`365`	`365`	`certStore.Open(OpenFlags.ReadWrite);`
`366`		`- if (!certStore.Certificates.Contains(publicKey))`
	`366`	`+ if (certStore.Certificates.Contains(publicKey))`
`367`	`367`	`{`
`368`		`- certStore.Add(publicKey);`
	`368`	`+ certStore.Remove(publicKey);`
`369`	`369`	`}`
	`370`	`+ certStore.Add(publicKey);`
`370`	`371`	`}`
`371`	`372`	`finally`
`372`	`373`	`{`