8303607: SunMSCAPI provider leaks memory and keys

Mat Carter · Paul Hohensee · commit a393f2581740 · 2023-10-09T23:48:59.000Z
Backport-of: c51d40cfebe793b2e979db0f2d91ac3b136311bb
diff --git 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;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,11 @@ JNIEXPORT void JNICALL Java_sun_security_mscapi_CKeyStore_loadKeysOrCertificateC`
`523`	`523`	`else`
`524`	`524`	`{`
`525`	`525`	`if (bCallerFreeProv == TRUE) {`
`526`		`- ::CryptReleaseContext(hCryptProv, NULL); // deprecated`
	`526`	`+ if ((dwKeySpec & CERT_NCRYPT_KEY_SPEC) == CERT_NCRYPT_KEY_SPEC) {`
	`527`	`+ NCryptFreeObject(hCryptProv);`
	`528`	`+ } else {`
	`529`	`+ ::CryptReleaseContext(hCryptProv, NULL); // deprecated`
	`530`	`+ }`
`527`	`531`	`bCallerFreeProv = FALSE;`
`528`	`532`	`}`
`529`	`533`