From d37c8620ffadfd864b376bb173cbc62cf8120dc2 Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 12 Jun 2023 06:55:51 +0000 Subject: [PATCH 1/5] 8304291: [AIX] Broken build after JDK-8301998 Backport-of: 310aa9347861922af5f0311e9e93a5f49dee6adc --- src/java.desktop/share/native/libharfbuzz/hb-algs.hh | 3 ++- src/java.desktop/share/native/libharfbuzz/hb-subset.cc | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh index 28dc036a51..0080b38085 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh @@ -875,7 +875,8 @@ hb_in_ranges (T u, T lo1, T hi1, Ts... ds) static inline bool hb_unsigned_mul_overflows (unsigned int count, unsigned int size, unsigned *result = nullptr) { -#if (defined(__GNUC__) && (__GNUC__ >= 4)) || (defined(__clang__) && (__clang_major__ >= 8)) +/* avoid with xlc16 clang on AIX; it sets the gcc macros */ +#if (defined(__GNUC__) && !defined(AIX) && (__GNUC__ >= 4)) || (defined(__clang__) && (__clang_major__ >= 8)) unsigned stack_result; if (!result) result = &stack_result; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc index a8161a3255..b2539de743 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc @@ -43,7 +43,11 @@ #include "OT/Color/sbix/sbix.hh" #include "hb-ot-os2-table.hh" #include "hb-ot-post-table.hh" + +#if !defined(AIX) #include "hb-ot-post-table-v2subset.hh" +#endif + #include "hb-ot-cff1-table.hh" #include "hb-ot-cff2-table.hh" #include "hb-ot-vorg-table.hh" From 5ba720f86e3900706b2a3518440db5b1cf022f06 Mon Sep 17 00:00:00 2001 From: WilburZjh Date: Mon, 12 Jun 2023 17:02:48 -0400 Subject: [PATCH 2/5] Add back the provider argument while getting MAC instance Signed-off-by: Jinhang Zhang --- .../classes/com/sun/crypto/provider/PBKDF2KeyImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java index d09e0adc4c..473c60d377 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java @@ -48,6 +48,8 @@ import jdk.internal.ref.CleanerFactory; +import openj9.internal.security.RestrictedSecurity; + /** * This class represents a PBE key derived using PBKDF2 defined * in PKCS#5 v2.0. meaning that @@ -118,7 +120,11 @@ private static byte[] getPasswordBytes(char[] passwd) { } else if (keyLength < 0) { throw new InvalidKeySpecException("Key length is negative"); } - this.prf = Mac.getInstance(prfAlgo); + if (RestrictedSecurity.isFIPSEnabled()) { + this.prf = Mac.getInstance(prfAlgo); + } else { + this.prf = Mac.getInstance(prfAlgo, SunJCE.getInstance()); + } this.key = deriveKey(prf, passwdBytes, salt, iterCount, keyLength); } catch (NoSuchAlgorithmException nsae) { // not gonna happen; re-throw just in case From 10e7e759b5953ccff7d8f5a09f25764f9735be38 Mon Sep 17 00:00:00 2001 From: Christoph Langer Date: Tue, 13 Jun 2023 06:30:25 +0000 Subject: [PATCH 3/5] 8309476: [11u] tools/jmod/hashes/HashesOrderTest.java fails intermittently Reviewed-by: mdoerr --- test/jdk/tools/jmod/hashes/HashesOrderTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/jdk/tools/jmod/hashes/HashesOrderTest.java b/test/jdk/tools/jmod/hashes/HashesOrderTest.java index 58d1b10e9b..5f5f5c3577 100644 --- a/test/jdk/tools/jmod/hashes/HashesOrderTest.java +++ b/test/jdk/tools/jmod/hashes/HashesOrderTest.java @@ -24,6 +24,7 @@ /* * @test * @bug 8240903 + * @key intermittent * @summary Test consistency of moduleHashes attribute between builds * @library /test/lib * @run testng HashesOrderTest From a0195000c2e1eaed802ca9b25041c9a9ef73695e Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Tue, 13 Jun 2023 09:23:51 -0400 Subject: [PATCH 4/5] Don't test unavailable algorithms Support for EdDSA, Ed25519 and Ed448 was added in Java 15. Signed-off-by: Keith W. Campbell --- test/jdk/java/security/Signature/TestCloneable.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/jdk/java/security/Signature/TestCloneable.java b/test/jdk/java/security/Signature/TestCloneable.java index 33e2383cfa..4312acd2c1 100644 --- a/test/jdk/java/security/Signature/TestCloneable.java +++ b/test/jdk/java/security/Signature/TestCloneable.java @@ -21,6 +21,12 @@ * questions. */ +/* + * =========================================================================== + * (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved + * =========================================================================== + */ + /* * @test * @bug 8246077 @@ -45,7 +51,6 @@ public Object[][] testData() { return new Object[][] { { "SHA1withDSA", "SUN" }, { "NONEwithDSA", "SUN" }, { "SHA224withDSA", "SUN" }, { "SHA256withDSA", "SUN" }, - { "EdDSA", "SunEC" }, { "Ed25519", "SunEC" }, { "Ed448", "SunEC" }, { "SHA1withECDSA", "SunEC" }, { "SHA224withECDSA", "SunEC" }, { "SHA256withECDSA", "SunEC" }, { "SHA384withECDSA", "SunEC" }, { "SHA512withECDSA", "SunEC" }, { "NONEwithECDSA", "SunEC" }, From 0ff7cf2de5933a5a7d0ff9ded008b4a0fa185586 Mon Sep 17 00:00:00 2001 From: J9 Build Date: Thu, 15 Jun 2023 03:03:06 +0000 Subject: [PATCH 5/5] Update OPENJDK_TAG to merged level jdk-11.0.20+6 Signed-off-by: J9 Build --- closed/openjdk-tag.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/closed/openjdk-tag.gmk b/closed/openjdk-tag.gmk index 764aeb8937..d33fe7288f 100644 --- a/closed/openjdk-tag.gmk +++ b/closed/openjdk-tag.gmk @@ -1 +1 @@ -OPENJDK_TAG := jdk-11.0.20+5 +OPENJDK_TAG := jdk-11.0.20+6