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

8319124: Update XML Security for Java to 3.0.3 #2465

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 19, 2024

I backport this for parity with 11.0.23-oracle.

Large parts applied clean, see first commit.

I had to do the following mostly trivial resolves:

src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/Init.java
A larger chunk did not apply, I could not see why so far.

src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java
patching file src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRSAPSSSignatureMethod.java
patching file src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
Trivial resolve of imports.
To make it compile I had to remove RSAPSSParameterSpec from the imports in two places.

patching file test/jdk/javax/xml/crypto/dsig/GenerationTests.java
All failed to apply automatically because RSAPSS coding is missing in the context.
Also, the new tests don't work as "JDK-8172680: Support SHA-3 based Hmac algorithms" is not in 11.

I kept the test coding to simplify future backports.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8319124 needs maintainer approval
  • Change requires CSR request JDK-8321532 to be approved

Issues

  • JDK-8319124: Update XML Security for Java to 3.0.3 (Enhancement - P3 - Approved)
  • JDK-8321532: Update XML Security for Java to 3.0.3 (CSR)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2465/head:pull/2465
$ git checkout pull/2465

Update a local copy of the PR:
$ git checkout pull/2465
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2465/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2465

View PR using the GUI difftool:
$ git pr show -t 2465

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2465.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 19, 2024

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@GoeLin GoeLin changed the title Goetz backport 8319124 Backport 6b5655a651a7c4418d0f4e19ce34b487e021910e Jan 19, 2024
@openjdk openjdk bot changed the title Backport 6b5655a651a7c4418d0f4e19ce34b487e021910e 8319124: Update XML Security for Java to 3.0.3 Jan 19, 2024
@openjdk
Copy link

openjdk bot commented Jan 19, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Jan 19, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 19, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 19, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 22, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8319124: Update XML Security for Java to 3.0.3

Reviewed-by: mbaesken

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 03cd885: 8169475: WheelModifier.java fails by timeout

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jan 22, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 23, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 23, 2024

Going to push as commit cb3c6ca.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 03cd885: 8169475: WheelModifier.java fails by timeout

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 23, 2024
@openjdk openjdk bot closed this Jan 23, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 23, 2024
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

@GoeLin Pushed as commit cb3c6ca.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@GoeLin GoeLin deleted the goetz_backport_8319124 branch February 1, 2024 08:39
@gnu-andrew
Copy link
Member

Did GenerationTests.java pass prior to this change? If so, introducing these tests we know to be broken - and which will never be fixed, as we're not backporting the SHA-3 enhancement - seems like a regression and that part of the change should be reverted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants