Merge master jdk-11.0.21+9 into openj9-staging #720
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added --enable-openjdk-crac-support, xa64 is enabled by default, other platforms are disabled by default; If OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT is on, opt_openjdkCracSupport and OPENJDK_CRAC_SUPPORT are enabled. Signed-off-by: Jason Feng fengj@ca.ibm.com Signed-off-by: Jason Feng <fengj@ca.ibm.com>
CRIU adds OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Fix unwanted changes introduced in PR ibmruntimes#710
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Rename OPENJDK_CRAC_SUPPORT to CRAC_SUPPORT
AIX puts zlibNX on the LIBPATH when running on P9 or later, but having this in the environment may cause some things, such as git clone, to fail when exec'ed from Java. For example, `fatal: pack has bad object at offset 3872100: inflate returned -5` Backport of ibmruntimes/openj9-openjdk-jdk#664 Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
Depends on eclipse-openj9/openj9#18169 Signed-off-by: tajila <atobia@ca.ibm.com>
Look for -XX:[+/-]UseZlibNX on AIX
Register natives in ConstantPool init
At the moment, if there is an OpenSSL failure when using NativeECKeyPairGenerator, a flag for that particular curve is set and the Sun Java implementation is used to complete the task. If another instance of NativeECKeyPairGenerator reaches the same failure, a ProviderException is thrown, as the issue with that particular curve should have been discovered during the call to initialize() thus creating and using an instance of ECKeyPairGenerator, and that particular point should never have been reached. However, in the scenario where the second instance of NativeECKeyPairGenerator has been initialized earlier, the flag for the problematic curve will never be discovered. This fix ensures that we always revert to the Sun Java implementation when an OpenSSL failure occurs. Signed-off by: Kostas Tsiounis <kostas.tsiounis@ibm.com>
Always revert to Java impl when OpenSSL fails
Reviewed-by: mbalao Backport-of: 111811e64245ae720a0617b7de0c52c60bb2bac1
Reviewed-by: mbalao Backport-of: 244b89fc786894cb8cca742f91875ebb98b603ff
Reviewed-by: mbalao Backport-of: d25ee81f56d67f2c51ba8b8c59f470c6f88ae47f
Reviewed-by: clanger Backport-of: 8cd9241448f818b5e307d408ac4395b518791096
Reviewed-by: mbalao Backport-of: 89fd6d34f859d61d9cf5a1edf9419eee7c338390
Reviewed-by: mbalao Backport-of: 7f5e120a631ffda3e6d5efc03bae572b21877b69
Reviewed-by: mbalao, andrew, clanger
…release 11.0.21 Reviewed-by: goetz
Conflicts: src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java src/jdk.crypto.ec/share/classes/sun/security/ec/XDHPublicKeyImpl.java Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
keithc-ca
approved these changes
Oct 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge master jdk-11.0.21+9 into openj9-staging
Conflicts:
Signed-off-by: Jason Feng fengj@ca.ibm.com