8303607: SunMSCAPI provider leaks memory and keys

Reviewed-by: weijun
2023-03-07 02:12:30 +00:00 · 2023-03-07 02:12:30 +00:00 · c51d40cfeb
commit c51d40cfeb
parent f64ed09e9a
1 changed files with 5 additions and 1 deletions
--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
@ -523,7 +523,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;
                }