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.

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

FIPS 17u 17.0.12+2 merge #35

Merged
merged 428 commits into from
Jun 13, 2024

Conversation

fitzsim
Copy link

@fitzsim fitzsim commented May 13, 2024

The current patch fips-17u-d63771ea660.patch fails -- because isNSS logic has been merged upstream -- with:

patching file src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
Hunk #3 FAILED at 144.
Hunk #4 FAILED at 400.
Hunk #5 succeeded at 455 (offset -1 lines).
2 out of 5 hunks FAILED -- saving rejects to file src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java.rej
patching file src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
patching file src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PBECipher.java
patching file src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
patching file src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java
Hunk #2 FAILED at 44.
1 out of 2 hunks FAILED -- saving rejects to file src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java.rej

This pull request is to update those two files. Please double-check the parentheses in the P11Key.java keySensitive check.

Amos Shi and others added 30 commits January 30, 2024 08:20
…ponent must be showing on the screen to determine its location

Backport-of: e7486e8
…only once per safepoint

Reviewed-by: phh
Backport-of: 808a039
Reviewed-by: mbaesken
Backport-of: e848d94
Reviewed-by: mbaesken
Backport-of: 8b24851
Reviewed-by: phh
Backport-of: 917838e
…ith /sys/kernel/mm/transparent_hugepage/hpage_pmd_size

8323331: fix typo hpage_pdm_size

Backport-of: 419e016
…m03t001/TestDescription.java on linux-all

Backport-of: ce36f6e
…connection for IPv6 address

Reviewed-by: phh
Backport-of: 3ccb3c0
…ileThreshold=100 -XX:TieredStopAtLevel=1

Backport-of: 61d0db3
…nueTest.java failed: java.net.BindException: Address already in use

Backport-of: a48bcf3
Amos Shi and others added 28 commits April 23, 2024 07:18
…em provider is packaged as JAR file on class path

Reviewed-by: lucy
Backport-of: 717792c
…'size' as size in bytes

Reviewed-by: stuefe
Backport-of: 90ab52e
… have debug symbols

Reviewed-by: lucy
Backport-of: 6c0bebc
…ws intermittent failures on linux ppc64le and aarch64

Backport-of: 50d1839
Added tag jdk-17.0.12+2 for changeset d2982c6
Copy link

@martinuy martinuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@gnu-andrew gnu-andrew merged commit e893be0 into rh-openjdk:fips-17u Jun 13, 2024
78 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.