diff --git a/dragonwell-extended-8.12.13_jdk8u345-ga.tar.gz b/dragonwell-extended-8.13.14_jdk8u352-ga.tar.gz similarity index 84% rename from dragonwell-extended-8.12.13_jdk8u345-ga.tar.gz rename to dragonwell-extended-8.13.14_jdk8u352-ga.tar.gz index 13a1bb99fbb457e4d4581c3d3254c15d0a4a96f1..0abb0da352b24ce6f681bf40ca84b604759ac241 100644 Binary files a/dragonwell-extended-8.12.13_jdk8u345-ga.tar.gz and b/dragonwell-extended-8.13.14_jdk8u352-ga.tar.gz differ diff --git a/java-1.8.0-alibaba-dragonwell.spec b/java-1.8.0-alibaba-dragonwell.spec index 394d6ef35345120233e4e4a0e2cd7fc4df1107f1..b6da9a95c09efc6d45164ce39cb612bddd49266d 100644 --- a/java-1.8.0-alibaba-dragonwell.spec +++ b/java-1.8.0-alibaba-dragonwell.spec @@ -9,13 +9,13 @@ %global javaver 1.8.0 %global major_ver 8 -%global minor_ver 12 -%global patch_ver 13 -%global update_ver 345 +%global minor_ver 13 +%global patch_ver 14 +%global update_ver 352 %global buildver ga %global dragonwell_src_ver %{major_ver}.%{minor_ver}.%{patch_ver} -%global alibaba_ver 8u345 +%global alibaba_ver 8u352 %global newdragonwellver %{javaver}.%{update_ver} %global dragsourcename dragonwell-extended-%{dragonwell_src_ver}_jdk%{alibaba_ver}-ga @@ -2643,6 +2643,9 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %endif %changelog +* Tue Nov 15 2022 lvfei - 1:1.8.0.352-1 +- update package tp 8.13.14.352 + * Wed Aug 31 2022 happy_orange - 1:1.8.0.345-1 - update package to 8.12.13.345 diff --git a/rh1860986-disable_tlsv1.3_in_fips_mode.patch b/rh1860986-disable_tlsv1.3_in_fips_mode.patch index 497421fe20437032092d923b240c4da49aa9f069..5cba57fbc797ff3f4d4fe58d1643a992aa9b343d 100644 --- a/rh1860986-disable_tlsv1.3_in_fips_mode.patch +++ b/rh1860986-disable_tlsv1.3_in_fips_mode.patch @@ -179,7 +179,7 @@ new file mode 100644 diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java --- openjdk.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java +++ openjdk/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java -@@ -31,6 +31,7 @@ +@@ -31,6 +31,7 @@ import java.security.*; import java.security.cert.*; import java.util.*; import javax.net.ssl.*; @@ -187,8 +187,8 @@ diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.ja import sun.security.action.GetPropertyAction; import sun.security.provider.certpath.AlgorithmChecker; import sun.security.validator.Validator; -@@ -539,20 +540,38 @@ - +@@ -539,20 +540,38 @@ public abstract class SSLContextImpl ext + static { if (SunJSSE.isFIPS()) { - supportedProtocols = Arrays.asList( @@ -206,7 +206,7 @@ diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.ja + ProtocolVersion.TLS11, + ProtocolVersion.TLS10 + ); - + - serverDefaultProtocols = getAvailableProtocols( - new ProtocolVersion[] { - ProtocolVersion.TLS13, @@ -239,8 +239,8 @@ diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.ja } else { supportedProtocols = Arrays.asList( ProtocolVersion.TLS13, -@@ -612,6 +631,16 @@ - +@@ -612,6 +631,16 @@ public abstract class SSLContextImpl ext + static ProtocolVersion[] getSupportedProtocols() { if (SunJSSE.isFIPS()) { + if (SharedSecrets.getJavaSecuritySystemConfiguratorAccess() @@ -256,8 +256,8 @@ diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.ja return new ProtocolVersion[] { ProtocolVersion.TLS13, ProtocolVersion.TLS12, -@@ -939,6 +968,16 @@ - +@@ -939,6 +968,16 @@ public abstract class SSLContextImpl ext + static ProtocolVersion[] getProtocols() { if (SunJSSE.isFIPS()) { + if (SharedSecrets.getJavaSecuritySystemConfiguratorAccess() @@ -271,21 +271,21 @@ diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.ja + }; + } return new ProtocolVersion[]{ + ProtocolVersion.TLS13, ProtocolVersion.TLS12, - ProtocolVersion.TLS11, diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/SunJSSE.java openjdk/jdk/src/share/classes/sun/security/ssl/SunJSSE.java --- openjdk.orig/jdk/src/share/classes/sun/security/ssl/SunJSSE.java +++ openjdk/jdk/src/share/classes/sun/security/ssl/SunJSSE.java -@@ -30,6 +30,8 @@ - +@@ -30,6 +30,8 @@ import static sun.security.util.Security + import java.security.*; - + +import sun.misc.SharedSecrets; + /** * The JSSE provider. * -@@ -215,8 +217,13 @@ +@@ -215,8 +217,13 @@ public abstract class SunJSSE extends ja "sun.security.ssl.SSLContextImpl$TLS11Context"); put("SSLContext.TLSv1.2", "sun.security.ssl.SSLContextImpl$TLS12Context");