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

8346285: Update jarsigner compatibility test for change in default digest algorithm #22765

Closed
wants to merge 2 commits into from
Closed

8346285: Update jarsigner compatibility test for change in default digest algorithm #22765

wants to merge 2 commits into from

Conversation

mpdonova
Copy link
Contributor

@mpdonova mpdonova commented Dec 16, 2024 •
edited by openjdk bot
Loading

In this small PR, I updated the jarsigner compatibility test to handle the difference in default digest algorithms between JDK versions. The previous default was SHA-256 but has been updated to SHA-384.

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

Issue

  • JDK-8346285: Update jarsigner compatibility test for change in default digest algorithm (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22765

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 16, 2024

👋 Welcome back mdonovan! 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
Copy link

openjdk bot commented Dec 16, 2024 •
edited
Loading

@mpdonova 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:

8346285: Update jarsigner compatibility test for change in default digest algorithm

Reviewed-by: weijun

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

  • d737978: 8343477: Remove unnecessary @SuppressWarnings annotations (compiler)
  • 8133eb2: 8346150: Jib dependency on autoconf missing for 'docs' profile
  • 45a3297: 8346248: serviceability/dcmd/vm/{SystemMapTest.java,SystemMapTest.java} failing on macos-aarch64
  • dbffe33: 8345263: Make sure that lint categories are used correctly when logging lint warnings
  • 32c8195: 8345801: C2: Clean up include statements to speed up compilation when touching type.hpp
  • 9286018: 8345322: RISC-V: Add concurrent gtests for cmpxchg variants
  • 4fc43b0: 8345770: javadoc: API documentation builds are not always reproducible
  • ee1c5ad: 8345975: Update SAP SE copyright year to 2024 where it was missed
  • 3518b4b: 8344171: Clone and initialize Assertion Predicates in order instead of in reverse-order
  • c88e081: 8346160: Fix -Wzero-as-null-pointer-constant warnings from explicit casts
  • ... and 10 more: https://git.openjdk.org/jdk/compare/266e3d0decc09b9c17c455e2c754cd39114fa31a...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 the rfr Pull request is ready for review label Dec 16, 2024
@openjdk
Copy link

openjdk bot commented Dec 16, 2024

@mpdonova The following label will be automatically applied to this pull request:

  • security

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

@openjdk openjdk bot added the security security-dev@openjdk.org label Dec 16, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 16, 2024 •
edited
Loading

Webrevs

wangweij
wangweij reviewed Dec 16, 2024
View reviewed changes
test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
@@ -1439,7 +1439,9 @@ private SignItem tsaDigestAlgorithm(String tsaDigestAlgorithm) {
}

String expectedTsaDigestAlg() {
return tsaDigestAlgorithm != null ? tsaDigestAlgorithm : "SHA-256";
Copy link
Contributor

Choose a reason for hiding this comment

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

You can actually get it from jdk.security.jarsigner.JarSigner.Builder.getDefaultDigestAlgorithm().

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated the code to use getDefaultDigestAlgorithm but I still need the version-check because this test invokes jarsigner in different JDKs that use different default algorithms.

wangweij
wangweij approved these changes Dec 16, 2024
View reviewed changes
Copy link
Contributor

@wangweij wangweij left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 16, 2024
@mpdonova
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 16, 2024

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

  • cb92595: 8336356: [s390x] preserve Vector Register before using for string compress / expand
  • d737978: 8343477: Remove unnecessary @SuppressWarnings annotations (compiler)
  • 8133eb2: 8346150: Jib dependency on autoconf missing for 'docs' profile
  • 45a3297: 8346248: serviceability/dcmd/vm/{SystemMapTest.java,SystemMapTest.java} failing on macos-aarch64
  • dbffe33: 8345263: Make sure that lint categories are used correctly when logging lint warnings
  • 32c8195: 8345801: C2: Clean up include statements to speed up compilation when touching type.hpp
  • 9286018: 8345322: RISC-V: Add concurrent gtests for cmpxchg variants
  • 4fc43b0: 8345770: javadoc: API documentation builds are not always reproducible
  • ee1c5ad: 8345975: Update SAP SE copyright year to 2024 where it was missed
  • 3518b4b: 8344171: Clone and initialize Assertion Predicates in order instead of in reverse-order
  • ... and 11 more: https://git.openjdk.org/jdk/compare/266e3d0decc09b9c17c455e2c754cd39114fa31a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 16, 2024

@mpdonova Pushed as commit e7d21fc.

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

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

@wangweij wangweij wangweij approved these changes

Assignees
No one assigned
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mpdonova @wangweij