From 10a232623d88a1864c15820ab81250d1c8ba36a5 Mon Sep 17 00:00:00 2001 From: rcjhd Date: Mon, 8 Dec 2025 20:31:53 +0800 Subject: [PATCH] Fix KAEProvider openssl3 msg memory leak --- huawei-JDK8-adapts-to-OpenSSL3.patch | 14 ++++++++------ openjdk-1.8.0.spec | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/huawei-JDK8-adapts-to-OpenSSL3.patch b/huawei-JDK8-adapts-to-OpenSSL3.patch index 660803b..4e80ac4 100644 --- a/huawei-JDK8-adapts-to-OpenSSL3.patch +++ b/huawei-JDK8-adapts-to-OpenSSL3.patch @@ -1,4 +1,4 @@ -Date: Fri, 28 Nov 2025 01:08:47 +0800 +Date: Mon, 8 Dec 2025 20:20:13 +0800 Subject: [PATCH] JDK8 adapts to OpenSSL3 --- @@ -39,7 +39,7 @@ Subject: [PATCH] JDK8 adapts to OpenSSL3 .../org/openeuler/security/openssl/kae_util.h | 6 +- .../security/openssl/openssl1_macro.h | 55 + .../security/openssl/openssl3_macro.h | 37 + - .../openeuler/security/openssl/ssl_utils.c | 1372 +++++++++++++++++ + .../openeuler/security/openssl/ssl_utils.c | 1374 +++++++++++++++++ .../openeuler/security/openssl/ssl_utils.h | 313 ++++ .../security/openssl/SM2CipherBenchmark.java | 117 ++ .../openssl/SM2SignatureBenchmark.java | 104 ++ @@ -49,7 +49,7 @@ Subject: [PATCH] JDK8 adapts to OpenSSL3 .../security/openssl/KAEUseEngineTest.java | 54 +- .../security/openssl/KaeProviderTest.java | 32 +- .../openeuler/security/openssl/SM2Test.java | 174 +++ - 47 files changed, 5967 insertions(+), 324 deletions(-) + 47 files changed, 5969 insertions(+), 324 deletions(-) create mode 100644 jdk/src/solaris/classes/org/openeuler/security/openssl/KAECurveDB.java create mode 100644 jdk/src/solaris/classes/org/openeuler/security/openssl/KAEECKeyFactory.java create mode 100644 jdk/src/solaris/classes/org/openeuler/security/openssl/KAEECParameters.java @@ -5690,10 +5690,10 @@ index 000000000..2ad08e407 \ No newline at end of file diff --git a/jdk/src/solaris/native/org/openeuler/security/openssl/ssl_utils.c b/jdk/src/solaris/native/org/openeuler/security/openssl/ssl_utils.c new file mode 100644 -index 000000000..1c011adc1 +index 000000000..1bce7337e --- /dev/null +++ b/jdk/src/solaris/native/org/openeuler/security/openssl/ssl_utils.c -@@ -0,0 +1,1372 @@ +@@ -0,0 +1,1374 @@ +/* + * Copyright (c) 2024, Huawei Technologies Co., Ltd. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -7033,6 +7033,8 @@ index 000000000..1c011adc1 + strcpy(msg, prefix); + strcat(msg, lib_name); + KAE_ThrowRuntimeException(env, msg); ++ free(msg); ++ return res; + } + + check_openSSL_Engine(env, init_result, lib_name); @@ -8166,5 +8168,5 @@ index 000000000..e45d524b2 + } +} -- -2.48.1 +2.43.0 diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index c9c836b..a05a202 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -953,7 +953,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3 +Release: 4 # 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 @@ -3064,6 +3064,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %endif %changelog +* Mon Dec 8 2025 jihaodi -1:1.8.0.472.b08-4 +- modified huawei-JDK8-adapts-to-OpenSSL3.patch + * Fri Nov 28 2025 Benshuai5D -1:1.8.0.472.b08-3 - add huawei-JDK8-adapts-to-OpenSSL3.patch -- Gitee