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

[22.3] Fix javax.crypto.JceSecurity substitutions in JDK >= 17.0.10 #610

Merged
merged 1 commit into from
Nov 9, 2023
Merged

[22.3] Fix javax.crypto.JceSecurity substitutions in JDK >= 17.0.10 #610

merged 1 commit into from
Nov 9, 2023

Conversation

zakkak
Copy link
Collaborator

@zakkak zakkak commented Nov 9, 2023

Closes #608

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Nov 9, 2023
@zakkak zakkak requested a review from jerboaa November 9, 2023 10:14
@zakkak zakkak changed the title Fix javax.crypto.JceSecurity substitutions in JDK >= 17.0.10 [22.3] Fix javax.crypto.JceSecurity substitutions in JDK >= 17.0.10 Nov 9, 2023
jerboaa
jerboaa reviewed Nov 9, 2023
View reviewed changes
substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java Outdated
Comment on lines 322 to 336
@Alias @TargetElement(onlyWith = JDK17_0_10OrLater.class)//
public static ReferenceQueue<Object> queue;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same comment as for the 23.0 PR with respect to the update version conditionals.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done

@jerboaa jerboaa linked an issue Nov 9, 2023 that may be closed by this pull request
[22.3] Mandrel 22.3 fails to build with JDK 17.0.10-EA #608
Closed
@jerboaa
Copy link
Collaborator

jerboaa commented Nov 9, 2023

CI failures:

@zakkak zakkak force-pushed the 2023-11-09-fix-608 branch 2 times, most recently from 74ca119 to d5fa158 Compare November 9, 2023 14:02
jerboaa
jerboaa reviewed Nov 9, 2023
View reviewed changes
substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java Outdated
*/
if (JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() >= 10) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

new QueueFieldPresent().getAsBoolean() instead?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java Outdated
/* Starting with JDK 17 the verification results map key is an identity wrapper object. */
if (JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() >= 10) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

if (new WeakIdentityWrapperPresent().getAsBoolean()) {
...
}

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done

@zakkak zakkak force-pushed the 2023-11-09-fix-608 branch from d5fa158 to f8374b8 Compare November 9, 2023 14:25
@zakkak zakkak force-pushed the 2023-11-09-fix-608 branch from f8374b8 to 16a8853 Compare November 9, 2023 14:57
@zakkak zakkak merged commit 5637090 into graalvm:mandrel/22.3 Nov 9, 2023
136 of 141 checks passed
@zakkak zakkak deleted the 2023-11-09-fix-608 branch November 9, 2023 20:43
@jerboaa jerboaa mentioned this pull request Nov 10, 2023
Closed
@zakkak zakkak added this to the 22.3.5.0-Final milestone Nov 10, 2023
@zakkak zakkak added the release/noteworthy-feature A PR that is worth highlighting in the Changelog label Nov 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jerboaa jerboaa jerboaa approved these changes

Assignees
No one assigned
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement. release/noteworthy-feature A PR that is worth highlighting in the Changelog
Projects
None yet
Milestone
22.3.5.0-Final
Development

Successfully merging this pull request may close these issues.

[22.3] Mandrel 22.3 fails to build with JDK 17.0.10-EA
2 participants
@zakkak @jerboaa