8303607: SunMSCAPI provider leaks memory and keys

Backport-of: a393f2581740f854518a3ef7caccd6d3c2d8e4a0
openjdk · Oct 12, 2023 · 94d3648 · 94d3648 · openjdk-notifier · Oct 12, 2023
1 parent 363855d
commit 94d3648
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
@@ -502,7 +502,11 @@ JNIEXPORT void JNICALL Java_sun_security_mscapi_CKeyStore_loadKeysOrCertificateC
             else
             {
                 if (bCallerFreeProv == TRUE) {
-                    ::CryptReleaseContext(hCryptProv, NULL); // deprecated
+                    if ((dwKeySpec & CERT_NCRYPT_KEY_SPEC) == CERT_NCRYPT_KEY_SPEC) {
+                        NCryptFreeObject(hCryptProv);
+                    } else {
+                        ::CryptReleaseContext(hCryptProv, NULL); // deprecated
+                    }
                     bCallerFreeProv = FALSE;
                 }