[release/9.0-staging] Ensure proper cleanup of key files when not per…

…sisting them (#109844) * Ensure proper cleanup of key files when not persisting them Code inspection suggested that keys imported into the CNG MachineKey store from PFXImportCertStore were not getting properly cleaned up. This change adds tests that prove that supposition, and then fixes the bug so they pass. * Support systems that have never had CAPI-DSS * Review feedback * Bump keysize to 2048 * This caused the tests to be too slow, so reuse 6 random keys for all of them * Remove the random ordering in machine-or-user for defaultkeyset (try both ways) * Remove incorrect copy/paste comment * Remove bad nullable annotation --------- Co-authored-by: Jeremy Barton <[email protected]>
dotnet · Nov 26, 2024 · 2c860a7 · 2c860a7
1 parent 718c531
commit 2c860a7
Show file tree

Hide file tree

Showing 3 changed files with 541 additions and 2 deletions.
diff --git a/...s/Common/src/Microsoft/Win32/SafeHandles/SafeCertContextHandleWithKeyContainerDeletion.cs b/...s/Common/src/Microsoft/Win32/SafeHandles/SafeCertContextHandleWithKeyContainerDeletion.cs
@@ -50,10 +50,16 @@ internal static void DeleteKeyContainer(SafeCertContextHandle pCertContext)
 
                         string providerName = Marshal.PtrToStringUni((IntPtr)(pProvInfo->pwszProvName))!;
                         string keyContainerName = Marshal.PtrToStringUni((IntPtr)(pProvInfo->pwszContainerName))!;
+                        CngKeyOpenOptions openOpts = CngKeyOpenOptions.None;
+
+                        if ((pProvInfo->dwFlags & Interop.Crypt32.CryptAcquireContextFlags.CRYPT_MACHINE_KEYSET) != 0)
+                        {
+                            openOpts = CngKeyOpenOptions.MachineKey;
+                        }
 
                         try
                         {
-                            using (CngKey cngKey = CngKey.Open(keyContainerName, new CngProvider(providerName)))
+                            using (CngKey cngKey = CngKey.Open(keyContainerName, new CngProvider(providerName), openOpts))
                             {
                                 cngKey.Delete();
                             }

diff --git a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
@@ -513,7 +513,8 @@
              Link="Common\Interop\Windows\Crypt32\Interop.MsgEncodingType.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
              Link="Common\Interop\Windows\Interop.Libraries.cs" />
-  <Compile Include="X509Certificates\InteropTests.Windows.cs" />
+    <Compile Include="X509Certificates\InteropTests.Windows.cs" />
+    <Compile Include="X509Certificates\X509FilesystemTests.Windows.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />