Merge remote-tracking branch 'origin/rosa2021.1' into rosa2023.1

java-17-openjdk.spec

@@ -362,7 +362,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      4
+%global rpmrelease      5
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -1363,7 +1363,7 @@ Patch2:    rh1648644-java_access_bridge_privileged_security.patch
 Patch3:    rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
 # Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
 Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
-
+Patch7: svace-fixes.patch
 #############################################
 #
 # OpenJDK patches in need of upstreaming
@@ -1777,6 +1777,7 @@ pushd %{top_level_dir_name}
 %patch2 -p1
 %patch3 -p1
 %patch6 -p1
+%patch7 -p1
 # nss.cfg PKCS11 support; must come last as it also alters java.security
 %patch1000 -p1
 popd # openjdk

svace-fixes.patch

@@ -0,0 +1,13 @@
+diff --git a/src/java.base/share/classes/sun/security/x509/X509CertImpl.java b/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
+index 254016d..5f11fdc 100644
+--- a/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
++++ b/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
+@@ -749,7 +749,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
+         id = attr.getPrefix();
+ 
+         if (id.equalsIgnoreCase(INFO)) {
+-            if (attr.getSuffix() != null) {
++            if (attr.getSuffix() == null) {
+                 info = null;
+             } else {
+                 info.delete(attr.getSuffix());