|
 |
5d84751 |
# HG changeset patch
|
|
|
5d84751 |
# User andrew
|
|
|
5d84751 |
# Date 1508194072 -3600
|
|
|
5d84751 |
# Mon Oct 16 23:47:52 2017 +0100
|
|
|
5d84751 |
# Node ID 5dcb55da00c1531264934559c9f10c2e0ae46420
|
|
|
5d84751 |
# Parent bf62c56e3604fee0018b19f65fd56c76dc156630
|
|
|
5d84751 |
PR3479, RH1486025: ECC and NSS JVM crash
|
|
|
5d84751 |
Summary: SunEC provider can have multiple instances, leading to premature NSS shutdown
|
|
|
5d84751 |
Contributed-by: Martin Balao <mbalao@redhat.com>
|
|
|
5d84751 |
|
|
|
5d84751 |
diff --git a/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers
|
|
|
5d84751 |
--- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
|
|
|
5d84751 |
+++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
|
|
|
5d84751 |
@@ -32,7 +32,6 @@
|
|
|
5d84751 |
Java_sun_security_ec_ECDSASignature_verifySignedDigest;
|
|
|
5d84751 |
Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
|
|
|
5d84751 |
Java_sun_security_ec_SunEC_initialize;
|
|
|
5d84751 |
- Java_sun_security_ec_SunEC_cleanup;
|
|
|
5d84751 |
local:
|
|
|
5d84751 |
*;
|
|
|
5d84751 |
};
|
|
|
5d84751 |
diff --git a/src/share/classes/sun/security/ec/SunEC.java b/src/share/classes/sun/security/ec/SunEC.java
|
|
|
5d84751 |
--- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
|
|
|
5d84751 |
+++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
|
|
|
5d84751 |
@@ -83,21 +83,8 @@
|
|
|
5d84751 |
}
|
|
|
5d84751 |
|
|
|
5d84751 |
/**
|
|
|
5d84751 |
- * Cleanup native resources during finalisation.
|
|
|
5d84751 |
- */
|
|
|
5d84751 |
- @Override
|
|
|
5d84751 |
- protected void finalize() {
|
|
|
5d84751 |
- cleanup();
|
|
|
5d84751 |
- }
|
|
|
5d84751 |
-
|
|
|
5d84751 |
- /**
|
|
|
5d84751 |
* Initialize the native code.
|
|
|
5d84751 |
*/
|
|
|
5d84751 |
private static native void initialize();
|
|
|
5d84751 |
|
|
|
5d84751 |
- /**
|
|
|
5d84751 |
- * Cleanup in the native layer.
|
|
|
5d84751 |
- */
|
|
|
5d84751 |
- private static native void cleanup();
|
|
|
5d84751 |
-
|
|
|
5d84751 |
}
|
|
|
5d84751 |
diff --git a/src/share/native/sun/security/ec/ECC_JNI.cpp b/src/share/native/sun/security/ec/ECC_JNI.cpp
|
|
|
5d84751 |
--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
|
|
|
5d84751 |
+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
|
|
|
5d84751 |
@@ -525,14 +525,12 @@
|
|
|
5d84751 |
}
|
|
|
5d84751 |
|
|
|
5d84751 |
JNIEXPORT void
|
|
|
5d84751 |
-JNICALL Java_sun_security_ec_SunEC_cleanup
|
|
|
5d84751 |
- (JNIEnv *env, jclass UNUSED(clazz))
|
|
|
5d84751 |
+JNICALL JNI_OnUnload
|
|
|
5d84751 |
+ (JavaVM *vm, void *reserved)
|
|
|
5d84751 |
{
|
|
|
5d84751 |
#ifdef SYSTEM_NSS
|
|
|
5d84751 |
RNG_RNGShutdown();
|
|
|
5d84751 |
- if (SECOID_Shutdown() != SECSuccess) {
|
|
|
5d84751 |
- ThrowException(env, INTERNAL_ERROR);
|
|
|
5d84751 |
- }
|
|
|
5d84751 |
+ SECOID_Shutdown();
|
|
|
5d84751 |
#endif
|
|
|
5d84751 |
}
|
|
|
5d84751 |
|