8303607: SunMSCAPI provider leaks memory and keys

Mat Carter · Paul Hohensee · commit 94d3648be11a · 2023-10-12T22:04:58.000Z
Backport-of: a393f2581740f854518a3ef7caccd6d3c2d8e4a0
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;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,11 @@ JNIEXPORT void JNICALL Java_sun_security_mscapi_CKeyStore_loadKeysOrCertificateC`
`502`	`502`	`else`
`503`	`503`	`{`
`504`	`504`	`if (bCallerFreeProv == TRUE) {`
`505`		`- ::CryptReleaseContext(hCryptProv, NULL); // deprecated`
	`505`	`+ if ((dwKeySpec & CERT_NCRYPT_KEY_SPEC) == CERT_NCRYPT_KEY_SPEC) {`
	`506`	`+ NCryptFreeObject(hCryptProv);`
	`507`	`+ } else {`
	`508`	`+ ::CryptReleaseContext(hCryptProv, NULL); // deprecated`
	`509`	`+ }`
`506`	`510`	`bCallerFreeProv = FALSE;`
`507`	`511`	`}`
`508`	`512`