Skip to content

8344137: Update XML Security for Java to 3.0.5#3156

Open
pmikova wants to merge 1 commit into
openjdk:masterfrom
pmikova:backport_JDK-8344137
Open

8344137: Update XML Security for Java to 3.0.5#3156
pmikova wants to merge 1 commit into
openjdk:masterfrom
pmikova:backport_JDK-8344137

Conversation

@pmikova

@pmikova pmikova commented Feb 16, 2026

Copy link
Copy Markdown

I backport this for parity with 11.0.29-oracle from 17

Mostly clean backport:

src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java did not apply cleanly for some reason, but no changes made
test/jdk/javax/xml/crypto/dsig/GenerationTests.java - keeping the changes but disabling the actual tests because of missing JDK-8166597
test/jdk/javax/xml/crypto/dsig/PSS.java test doesn't apply to the JDK11, as it is missing JDK-8241306 - disabling it for JDK < 17

Keeping the file and changes in tests for easier future backport resolving.



Progress

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

Issues

  • JDK-8344137: Update XML Security for Java to 3.0.5 (Enhancement - P3)
  • JDK-8345822: Update XML Security for Java to 3.0.5 (CSR)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3156

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper

bridgekeeper Bot commented Feb 16, 2026

Copy link
Copy Markdown

👋 Welcome back pmikova! 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.

@openjdk

openjdk Bot commented Feb 16, 2026

Copy link
Copy Markdown

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk Bot added the rfr Pull request is ready for review label Feb 16, 2026
@pmikova pmikova changed the title 8344137: Update XML Security for Java to 3.0.5 Backport e7454faf3ebbc663dd36fad057a5670b1fa27f47 Feb 16, 2026
@openjdk openjdk Bot changed the title Backport e7454faf3ebbc663dd36fad057a5670b1fa27f47 8344137: Update XML Security for Java to 3.0.5 Feb 16, 2026
@openjdk

openjdk Bot commented Feb 16, 2026

Copy link
Copy Markdown

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

@openjdk openjdk Bot added the backport Port of a pull request already in a different code base label Feb 16, 2026
@mlbridge

mlbridge Bot commented Feb 16, 2026

Copy link
Copy Markdown

Webrevs

@gnu-andrew gnu-andrew left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This mostly looks good. I think the issue with Constants.java is the context with 17u having _TAG_RSAPSSPARAMS where 11u doesn't (which may also relate to your issues with PSS.java.

I'll have to look at the two problematic tests to see what is going on there. If it's not something we can ever backport, there is no point having dead code in there, but at the moment, it's not clear to me if support is completely missing or just the variables in the Java spec which we can't backport. I'll try and get back to you on this tomorrow.

@bridgekeeper

bridgekeeper Bot commented Mar 18, 2026

Copy link
Copy Markdown

@pmikova This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@pmikova

pmikova commented Mar 23, 2026

Copy link
Copy Markdown
Author

/keepalive

@openjdk

openjdk Bot commented Mar 23, 2026

Copy link
Copy Markdown

@pmikova The pull request is being re-evaluated and the inactivity timeout has been reset.

@bridgekeeper

bridgekeeper Bot commented Apr 21, 2026

Copy link
Copy Markdown

@pmikova This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@pmikova

pmikova commented May 4, 2026

Copy link
Copy Markdown
Author

/keepalive

@openjdk

openjdk Bot commented May 4, 2026

Copy link
Copy Markdown

@pmikova The pull request is being re-evaluated and the inactivity timeout has been reset.

@openjdk openjdk Bot removed the rfr Pull request is ready for review label May 4, 2026
@bridgekeeper

bridgekeeper Bot commented Jun 2, 2026

Copy link
Copy Markdown

@pmikova This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@pmikova

pmikova commented Jun 8, 2026

Copy link
Copy Markdown
Author

/keepalive

@openjdk

openjdk Bot commented Jun 8, 2026

Copy link
Copy Markdown

@pmikova The pull request is being re-evaluated and the inactivity timeout has been reset.

@gnu-andrew

Copy link
Copy Markdown
Member

I'll get back to this one today. Sorry for the delay.

@gnu-andrew

Copy link
Copy Markdown
Member

@pmikova you'll need to do /template append and then tick the "I didn't use a dumb AI bot" checkbox.

@pmikova

pmikova commented Jun 15, 2026

Copy link
Copy Markdown
Author

/template append

@openjdk

openjdk Bot commented Jun 15, 2026

Copy link
Copy Markdown

@pmikova The pull request template has been appended to the pull request body

@openjdk openjdk Bot added the rfr Pull request is ready for review label Jun 15, 2026

@gnu-andrew gnu-andrew left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ok, I see now why the dead code was added; the updates to 3.0.2 and 3.0.3 took this approach as well. I think it would be better to just use this opportunity to clear out this unused code. It makes it slightly easier to backport (though as you've seen, it's still not clean anyway) but it causes confusion for someone looking at the test in 11u.

After some digging, I found that the additions from this patch and 3.0.3 to GenerationTests.java would need JDK-8172366: Support SHA-3 based signatures. The ed25519 and ed448 additions for 3.0.2 would need JDK-8166597: Crypto support for the EdDSA Signature Algorithm. I don't see any likelihood of these being added to 11u at this stage.

PSS.java fails because of JDK-8241306: Add SignatureMethodParameterSpec subclass for RSASSA-PSS params being absent. It's probably the closest to working with this time the missing code being specific to XML Security. I would just remove that test.

I would suggest adding gnu-andrew@4823976 on top of your branch. This removes the unused and unsupported code in these tests and documents why.

@gnu-andrew

Copy link
Copy Markdown
Member

You'll want to merge with master too; I'm seeing Mac test failures a while ago and for Windows, you'll want to wait for this merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants