Merge master jdk-17.0.4+7 into openj9-staging

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

Author: j9build

src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c

@@ -50,20 +50,28 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jclass clazz,
     jint fd = fdval(env, fdo);
     int rv;
 
+#if defined(__APPLE__)
+    // On macOS systems we use disconnectx
+    rv = disconnectx(fd, SAE_ASSOCID_ANY, SAE_CONNID_ANY);
+#else
     SOCKETADDRESS sa;
+    memset(&sa, 0, sizeof(sa));
+    #if defined(_ALLBSD_SOURCE)
+        sa.sa.sa_family = isIPv6 ? AF_INET6 : AF_INET;
+    #else
+        sa.sa.sa_family = AF_UNSPEC;
+    #endif
     socklen_t len = isIPv6 ? sizeof(struct sockaddr_in6) :
                              sizeof(struct sockaddr_in);
-
-    memset(&sa, 0, sizeof(sa));
-#if defined(_ALLBSD_SOURCE)
-    sa.sa.sa_family = isIPv6 ? AF_INET6 : AF_INET;
-#else
-    sa.sa.sa_family = AF_UNSPEC;
-#endif
-
     rv = connect(fd, &sa.sa, len);
+#endif
 
-#if defined(_ALLBSD_SOURCE)
+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
+    // On _ALLBSD_SOURCE except __APPLE__ we consider EADDRNOTAVAIL
+    // error to be OK and ignore it. __APPLE__ systems are excluded
+    // in this check since for __APPLE__ systems, unlike other BSD systems,
+    // we issue a "disconnectx" call (a few lines above),
+    // which isn't expected to return this error code.
     if (rv < 0 && errno == EADDRNOTAVAIL)
         rv = errno = 0;
 #elif defined(_AIX)

test/jdk/ProblemList.txt

@@ -688,8 +688,6 @@ sun/security/provider/PolicyParser/ExtDirsChange.java           8039280 generic-
 sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
 sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java 8277970 linux-all,macosx-x64
 
-sun/security/ssl/X509TrustManagerImpl/Symantec/Distrust.java    8287109 generic-all
-
 ############################################################################
 
 # jdk_sound

test/jdk/java/nio/channels/DatagramChannel/Disconnect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 7132924
+ * @bug 7132924 8285515
  * @library /test/lib
  * @key intermittent
  * @summary Test DatagramChannel.disconnect when DatagramChannel is connected to an IPv4 socket

test/jdk/sun/security/ssl/X509TrustManagerImpl/Symantec/Distrust.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -54,15 +54,14 @@ public class Distrust {
     // Each of the roots have a test certificate chain stored in a file
     // named "<root>-chain.pem".
     private static String[] rootsToTest = new String[] {
-        "geotrustglobalca", "geotrustprimarycag2", "geotrustprimarycag3",
+        "geotrustprimarycag2", "geotrustprimarycag3",
         "geotrustuniversalca", "thawteprimaryrootca", "thawteprimaryrootcag2",
         "thawteprimaryrootcag3", "verisignclass3g3ca", "verisignclass3g4ca",
         "verisignclass3g5ca", "verisignuniversalrootca" };
 
     // Each of the subCAs with a delayed distrust date have a test certificate
     // chain stored in a file named "<subCA>-chain.pem".
-    private static String[] subCAsToTest = new String[] {
-        "appleistca2g1", "appleistca8g1" };
+    private static String[] subCAsToTest = new String[]{"appleistca8g1"};
 
     // A date that is after the restrictions take affect
     private static final Date APRIL_17_2019 =
@@ -180,13 +179,19 @@ private static void testTM(X509TrustManager xtm, X509Certificate[] chain,
                 throw new Exception("chain should be invalid");
             }
         } catch (CertificateException ce) {
+            // expired TLS certificates should not be treated as failure
+            if (expired(ce)) {
+                System.err.println("Test is N/A, chain is expired");
+                return;
+            }
             if (valid) {
                 throw new Exception("Unexpected exception, chain " +
                                     "should be valid", ce);
             }
             if (ce instanceof ValidatorException) {
                 ValidatorException ve = (ValidatorException)ce;
                 if (ve.getErrorType() != ValidatorException.T_UNTRUSTED_CERT) {
+                    ce.printStackTrace(System.err);
                     throw new Exception("Unexpected exception: " + ce);
                 }
             } else {
@@ -195,6 +200,21 @@ private static void testTM(X509TrustManager xtm, X509Certificate[] chain,
         }
     }
 
+    // check if a cause of exception is an expired cert
+    private static boolean expired(CertificateException ce) {
+        if (ce instanceof CertificateExpiredException) {
+            return true;
+        }
+        Throwable t = ce.getCause();
+        while (t != null) {
+            if (t instanceof CertificateExpiredException) {
+                return true;
+            }
+            t = t.getCause();
+        }
+        return false;
+    }
+
     private static X509Certificate[] loadCertificateChain(String name)
             throws Exception {
         try (InputStream in = new FileInputStream(TEST_SRC + File.separator +