Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest OpenJ9 fixes into 0.40 #671

Merged
merged 8 commits into from
Jun 16, 2023
Merged

Merge latest OpenJ9 fixes into 0.40 #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d37c862
8304291: [AIX] Broken build after JDK-8301998
Jun 12, 2023
5ba720f
Add back the provider argument while getting MAC instance
WilburZjh Jun 12, 2023
10e7e75
8309476: [11u] tools/jmod/hashes/HashesOrderTest.java fails intermitt…
RealCLanger Jun 13, 2023
a019500
Don't test unavailable algorithms
keithc-ca Jun 13, 2023
0f2be98
Merge pull request #670 from keithc-ca/cloneable
JasonFengJ9 Jun 13, 2023
85a45a2
Merge pull request #669 from WilburZjh/pkcs12patch
keithc-ca Jun 13, 2023
8fd994c
Merge master jdk-11.0.20+6 into openj9-staging
j9build Jun 15, 2023
0ff7cf2
Update OPENJDK_TAG to merged level jdk-11.0.20+6
j9build Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion closed/openjdk-tag.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OPENJDK_TAG := jdk-11.0.20+5
OPENJDK_TAG := jdk-11.0.20+6
8 changes: 7 additions & 1 deletion src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion test/jdk/java/security/Signature/TestCloneable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
* questions.
*/

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved
* ===========================================================================
*/

/*
* @test
* @bug 8246077
Expand All @@ -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" },
Expand Down
1 change: 1 addition & 0 deletions test/jdk/tools/jmod/hashes/HashesOrderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
/*
* @test
* @bug 8240903
* @key intermittent
* @summary Test consistency of moduleHashes attribute between builds
* @library /test/lib
* @run testng HashesOrderTest
Expand Down
Loading