Merge master jdk-17.0.16+3 into openj9-staging

Signed-off-by: J9 Build <[email protected]>

Author: j9build

make/data/cacerts/camerfirmachamberscommerceca

@@ -49,7 +49,8 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
         $(GTEST_FRAMEWORK_SRC)/googletest/src \
         $(GTEST_FRAMEWORK_SRC)/googlemock/src, \
     INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
-    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral maybe-uninitialized, \
+    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral \
+        maybe-uninitialized zero-as-null-pointer-constant, \
     DISABLED_WARNINGS_clang := undef unused-result format-nonliteral, \
     CFLAGS := $(JVM_CFLAGS) \
         -I$(GTEST_FRAMEWORK_SRC)/googletest \

make/data/cacerts/camerfirmachambersignca

@@ -605,7 +605,8 @@ public void setZoneStrings(String[][] newZoneStrings) {
         for (int i = 0; i < newZoneStrings.length; ++i) {
             int len = newZoneStrings[i].length;
             if (len < 5) {
-                throw new IllegalArgumentException();
+                throw new IllegalArgumentException(String.format(
+                        "Row %s of the input array does not have a length of at least 5", i));
             }
             aCopy[i] = Arrays.copyOf(newZoneStrings[i], len);
         }

make/hotspot/lib/CompileGtest.gmk

@@ -43,26 +43,14 @@ final class CamerfirmaTLSPolicy {
 
     private static final Debug debug = Debug.getInstance("certpath");
 
-    // SHA-256 certificate fingerprints of distrusted roots
-    private static final Set<String> FINGERPRINTS = Set.of(
-        // cacerts alias: camerfirmachamberscommerceca
-        // DN: CN=Chambers of Commerce Root,
-        //     OU=http://www.chambersign.org,
-        //     O=AC Camerfirma SA CIF A82743287, C=EU
-        "0C258A12A5674AEF25F28BA7DCFAECEEA348E541E6F5CC4EE63B71B361606AC3",
-        // cacerts alias: camerfirmachambersca
-        // DN: CN=Chambers of Commerce Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0",
-        // cacerts alias: camerfirmachambersignca
-        // DN: CN=Global Chambersign Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "136335439334A7698016A0D324DE72284E079D7B5220BB8FBD747816EEBEBACA"
-    );
+    // SHA-256 certificate fingerprint of distrusted root for TLS
+    // cacerts alias: camerfirmachambersca
+    // DN: CN=Chambers of Commerce Root - 2008,
+    //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
+    //     L=Madrid (see current address at www.camerfirma.com/address),
+    //     C=EU
+    private static final String FINGERPRINT =
+            "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0";
 
     // Any TLS Server certificate that is anchored by one of the Camerfirma
     // roots above and is issued after this date will be distrusted.
@@ -85,7 +73,7 @@ static void checkDistrust(X509Certificate[] chain)
             throw new ValidatorException("Cannot generate fingerprint for "
                 + "trust anchor of TLS server certificate");
         }
-        if (FINGERPRINTS.contains(fp)) {
+        if (FINGERPRINT.equalsIgnoreCase(fp)) {
             Date notBefore = chain[0].getNotBefore();
             LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(),
                                                         ZoneOffset.UTC);

src/java.base/share/classes/java/text/DateFormatSymbols.java

@@ -2073,6 +2073,10 @@ static int findDisplayedMnemonicIndex(String text, int mnemonic) {
             return -1;
         }
 
+        if (mnemonic >= 'a' && mnemonic <= 'z') {
+            return -1;
+        }
+
         char uc = Character.toUpperCase((char)mnemonic);
         char lc = Character.toLowerCase((char)mnemonic);
 

src/java.base/share/classes/sun/security/validator/CamerfirmaTLSPolicy.java

@@ -334,7 +334,7 @@ static void run_in_new_thread(const args_t* args) {
 extern "C" void* thread_wrapper(void* p) {
   const args_t* const p_args = (const args_t*) p;
   runUnitTestsInner(p_args->argc, p_args->argv);
-  return 0;
+  return nullptr;
 }
 
 static void run_in_new_thread(const args_t* args) {

src/java.desktop/share/classes/javax/swing/SwingUtilities.java

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -37,5 +37,5 @@ The */Test.java files should never be modified directly, because they are
 generated by TestGenerator and therefore all required changes must be made in
 that class.
 
-[1] https://wiki.openjdk.java.net/display/CodeTools/jcstress
+[1] https://wiki.openjdk.org/display/CodeTools/jcstress
 

test/hotspot/gtest/gtestMain.cpp

@@ -56,7 +56,7 @@
  * added to classpath. One can replace @notest by @test in jtreg test
  * description above to run this class with jtreg.
  *
- * @see <a href=https://wiki.openjdk.java.net/display/CodeTools/jcstress>jcstress</a>
+ * @see <a href=https://wiki.openjdk.org/display/CodeTools/jcstress>jcstress</a>
  */
 public class TestGenerator {
     private static final String COPYRIGHT;

test/hotspot/jtreg/applications/jcstress/README

@@ -52,7 +52,7 @@
 // an incorrect result on 32-bit server VMs on SPARC due to a regression
 // introduced by the change: "6420645: Create a vm that uses compressed oops
 // for up to 32gb heapsizes"
-// (http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/ba764ed4b6f2).  Further
+// (https://git.openjdk.org/jdk/commit/4a831d4).  Further
 // investigation showed that change 6420645 is not really the root cause of
 // this error but only reveals a problem with the float register encodings in
 // sparc.ad which was hidden until now.