Merge master jdk-17.0.5+5 into openj9-staging

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

Author: j9build

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -69,6 +69,7 @@ final class P11SecretKeyFactory extends SecretKeyFactorySpi {
         addKeyType("AES",      CKK_AES);
         addKeyType("Blowfish", CKK_BLOWFISH);
         addKeyType("ChaCha20", CKK_CHACHA20);
+        addKeyType("ChaCha20-Poly1305", CKK_CHACHA20);
 
         // we don't implement RC2 or IDEA, but we want to be able to generate
         // keys for those SSL/TLS ciphersuites.

test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java

@@ -114,9 +114,8 @@ private static void testMemorySoftLimit(String valueToSet, String expectedTraceV
     private static void testOOM(String dockerMemLimit, int sizeToAllocInMb) throws Exception {
         Common.logNewTestCase("OOM");
 
-        // add "--memory-swappiness 0" so as to disable anonymous page swapping.
         DockerRunOptions opts = Common.newOpts(imageName, "AttemptOOM")
-            .addDockerOpts("--memory", dockerMemLimit, "--memory-swappiness", "0", "--memory-swap", dockerMemLimit);
+            .addDockerOpts("--memory", dockerMemLimit, "--memory-swap", dockerMemLimit);
         opts.classParams.add("" + sizeToAllocInMb);
 
         // make sure we avoid inherited Xmx settings from the jtreg vmoptions

test/jdk/jdk/jfr/api/recording/dump/TestDumpDevNull.java

@@ -24,14 +24,13 @@
 package jdk.jfr.api.recording.dump;
 
 import java.nio.file.Path;
-
 import jdk.jfr.Recording;
 
 /**
  * @test
  * @summary Tests that it's possible to dump to /dev/null without a livelock
  * @key jfr
- * @requires vm.hasJFR
+ * @requires vm.hasJFR & (os.family != "windows")
  * @library /test/lib
  * @run main/othervm -Xlog:jfr jdk.jfr.api.recording.dump.TestDumpDevNull
  */

test/jdk/sun/security/pkcs11/tls/TestKeyMaterialChaCha20.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2022, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8288985
+ * @summary Tests that P11TlsKeyMaterialGenerator works with ChaCha20-Poly1305
+ * @library /test/lib ..
+ * @modules java.base/sun.security.internal.spec
+ *          jdk.crypto.cryptoki
+ * @run main/othervm TestKeyMaterialChaCha20
+ */
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import java.security.Provider;
+import java.security.NoSuchAlgorithmException;
+import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
+import sun.security.internal.spec.TlsMasterSecretParameterSpec;
+import sun.security.internal.spec.TlsKeyMaterialParameterSpec;
+
+
+public class TestKeyMaterialChaCha20 extends PKCS11Test {
+
+    public static void main(String[] args) throws Exception {
+        main(new TestKeyMaterialChaCha20(), args);
+    }
+
+    @Override
+    public void main(Provider provider) throws Exception {
+        KeyGenerator kg1, kg2, kg3;
+        try {
+            kg1 = KeyGenerator.getInstance("SunTlsRsaPremasterSecret", provider);
+        } catch (Exception e) {
+            System.out.println("Skipping, SunTlsRsaPremasterSecret KeyGenerator not supported");
+            return;
+        }
+        try {
+            kg2 = KeyGenerator.getInstance("SunTls12MasterSecret", provider);
+        } catch (Exception e) {
+            System.out.println("Skipping, SunTls12MasterSecret KeyGenerator not supported");
+            return;
+        }
+        try {
+            kg3 = KeyGenerator.getInstance("SunTls12KeyMaterial", provider);
+        } catch (Exception e) {
+            System.out.println("Skipping, SunTls12KeyMaterial KeyGenerator not supported");
+            return;
+        }
+
+        kg1.init(new TlsRsaPremasterSecretParameterSpec(0x0303, 0x0303));
+        SecretKey preMasterSecret = kg1.generateKey();
+
+        TlsMasterSecretParameterSpec spec = new TlsMasterSecretParameterSpec(
+            preMasterSecret,
+            3, 3,
+            new byte[32],
+            new byte[32],
+            "SHA-256", 32, 64);
+        kg2.init(spec);
+        SecretKey masterSecret = kg2.generateKey();
+
+        TlsKeyMaterialParameterSpec params = new TlsKeyMaterialParameterSpec(
+            masterSecret, 3, 3,
+            new byte[32],
+            new byte[32],
+            "ChaCha20-Poly1305", 32, 32,
+            12, 0,
+            "SHA-256", 32, 64);
+        kg3.init(params);
+        kg3.generateKey();
+    }
+
+}