From 867d1f54c523a2b0717708c39f335349efb298ed Mon Sep 17 00:00:00 2001 From: noah Date: Mon, 5 Jul 2021 09:47:15 +0800 Subject: [PATCH] I3Z1H1: Fix ECDH and DH memory usage --- Fix-ECDH-and-DH-memory-usage.patch | 25 +++++++++++++++++++++++++ openjdk-1.8.0.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Fix-ECDH-and-DH-memory-usage.patch diff --git a/Fix-ECDH-and-DH-memory-usage.patch b/Fix-ECDH-and-DH-memory-usage.patch new file mode 100644 index 0000000..a559b76 --- /dev/null +++ b/Fix-ECDH-and-DH-memory-usage.patch @@ -0,0 +1,25 @@ +diff --git a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keyagreement_dh.c b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keyagreement_dh.c +index 5894a4b4..26ce9a8e 100644 +--- a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keyagreement_dh.c ++++ b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keyagreement_dh.c +@@ -132,6 +132,8 @@ cleanup: + KAE_ReleaseBigNumFromByteArray(g_bn); + if (secret != NULL) + free(secret); ++ if (computeKeyRetBn != NULL) ++ BN_free(computeKeyRetBn); + + return retByteArray; + } +diff --git a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keypairgenerator_ec.c b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keypairgenerator_ec.c +index 93b710bf..0f32674c 100644 +--- a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keypairgenerator_ec.c ++++ b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_keypairgenerator_ec.c +@@ -383,7 +383,6 @@ static EC_GROUP* GetGroupByParam(JNIEnv* env, jbyteArray pArr, jbyteArray aArr, + EC_GROUP* group = NULL; + BN_CTX* ctx = NULL; + EC_POINT* generator = NULL; +- p = KAE_GetBigNumFromByteArray(env, pArr); + if ((p = KAE_GetBigNumFromByteArray(env, pArr)) == NULL || (a = KAE_GetBigNumFromByteArray(env, aArr)) == NULL || + (b = KAE_GetBigNumFromByteArray(env, bArr)) == NULL || (x = KAE_GetBigNumFromByteArray(env, xArr)) == NULL || + (y = KAE_GetBigNumFromByteArray(env, yArr)) == NULL || (cofactor = BN_new()) == NULL || diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index d83a699..317844e 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 15 +Release: 16 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1110,6 +1110,7 @@ Patch196: g1gc-numa-aware-Implementation.patch Patch197: implementation_of_Blas_hotspot_function_in_Intrinsics.patch Patch198: fix_G1GC_memory_leak_in_numa.patch Patch199: delete_untrustworthy_cacert_soneraclass2ca.patch +Patch200: Fix-ECDH-and-DH-memory-usage.patch ############################################# # @@ -1568,6 +1569,7 @@ pushd %{top_level_dir_name} %patch197 -p1 %patch198 -p1 %patch199 -p1 +%patch200 -p1 popd # System library fixes @@ -2184,6 +2186,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 5 2021 noah - 1:1.8.0.292-b10.16 +- add Fix-ECDH-and-DH-memory-usage.patch + * Mon Jun 28 2021 kuenking111 - 1:1.8.0.292-b10.15 - fix delete_untrustworthy_cacert_soneraclass2ca.patch -- Gitee