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

8305972: Update XML Security for Java to 3.0.2 #13840

Closed
wants to merge 12 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented May 5, 2023

Update XML Security for Java to 3.0.2. Some change to tests:

  1. A new HereFunction.java to test the new security property "jdk.xml.dsig.hereFunctionSupported".
  2. EdDSA does not support KeyValue. Use X.509 certificate instead.

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
  • Change requires CSR request JDK-8307507 to be approved

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13840/head:pull/13840
$ git checkout pull/13840

Update a local copy of the PR:
$ git checkout pull/13840
$ git pull https://git.openjdk.org/jdk.git pull/13840/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13840

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13840.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 5, 2023

👋 Welcome back weijun! 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 added csr Pull request needs approved CSR before integration rfr Pull request is ready for review labels May 5, 2023
@openjdk
Copy link

openjdk bot commented May 5, 2023

@wangweij The following labels will be automatically applied to this pull request:

  • core-libs
  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels May 5, 2023
@mlbridge
Copy link

mlbridge bot commented May 5, 2023

@wangweij
Copy link
Contributor Author

wangweij commented May 8, 2023

/label remove core-libs

@openjdk openjdk bot removed the core-libs core-libs-dev@openjdk.org label May 8, 2023
@openjdk
Copy link

openjdk bot commented May 8, 2023

@wangweij
The core-libs label was successfully removed.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label May 15, 2023
@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label May 16, 2023
Copy link
Member

@seanjmullan seanjmullan left a comment

Choose a reason for hiding this comment

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

Just one wording suggestion. Otherwise looks good

src/java.base/share/conf/security/java.security Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented May 19, 2023

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8305972: Update XML Security for Java to 3.0.2

Reviewed-by: mullan

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 34 new commits pushed to the master branch:

  • 265f40b: 8308396: Fix offset_of conversion warnings in runtime code
  • a5343fa: 8281149: (fs) java/nio/file/FileStore/Basic.java fails with java.lang.RuntimeException: values differ by more than 1GB
  • 44218b1: 8308248: Revisit alignment of layout constants on 32-bit platforms
  • 80ef5c2: 8308410: broken compilation of test\jdk\tools\launcher\exeJliLaunchTest.c
  • 326d778: 8306057: False arguments calling dispatch_base for aarch64
  • 690d396: 8308408: Build failure with -Werror=maybe-uninitialized in libjli/java.c with GCC8
  • fa14314: 8303669: SelectVersion indexes past the end of the argv array
  • 25868b9: 8132995: Matcher$ImmutableMatchResult should be optimized to reduce space usage
  • 6765761: 8308118: Avoid multiarray allocations in AESCrypt.makeSessionKey
  • 97ade57: 8307609: RISC-V: Added support for Extract, Compress, Expand and other nodes for Vector API
  • ... and 24 more: https://git.openjdk.org/jdk/compare/8bedf2efd7671834b3f7ff42bc33008821545d9f...master

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 csr Pull request needs approved CSR before integration labels May 19, 2023
@wangweij
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 19, 2023

Going to push as commit f0aebc8.
Since your change was applied there have been 34 commits pushed to the master branch:

  • 265f40b: 8308396: Fix offset_of conversion warnings in runtime code
  • a5343fa: 8281149: (fs) java/nio/file/FileStore/Basic.java fails with java.lang.RuntimeException: values differ by more than 1GB
  • 44218b1: 8308248: Revisit alignment of layout constants on 32-bit platforms
  • 80ef5c2: 8308410: broken compilation of test\jdk\tools\launcher\exeJliLaunchTest.c
  • 326d778: 8306057: False arguments calling dispatch_base for aarch64
  • 690d396: 8308408: Build failure with -Werror=maybe-uninitialized in libjli/java.c with GCC8
  • fa14314: 8303669: SelectVersion indexes past the end of the argv array
  • 25868b9: 8132995: Matcher$ImmutableMatchResult should be optimized to reduce space usage
  • 6765761: 8308118: Avoid multiarray allocations in AESCrypt.makeSessionKey
  • 97ade57: 8307609: RISC-V: Added support for Extract, Compress, Expand and other nodes for Vector API
  • ... and 24 more: https://git.openjdk.org/jdk/compare/8bedf2efd7671834b3f7ff42bc33008821545d9f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 19, 2023

@wangweij Pushed as commit f0aebc8.

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

@wangweij wangweij deleted the 8305972 branch May 19, 2023 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

2 participants