Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 17, 2022

I backport this for parity with 17.0.4-oracle.

JarVerifier: resolve due to context.
ManifestEntryVerifier.java: I had to remove an argument 'false' because "JDK-8275887: jarsigner prints invalid digest/signature algorithm warnings if keysize is weak/disabled" is not in 17.

I had to add a hunk from "JDK-8269039: Disable SHA-1 Signed JARs" to
SecurityUtils.java to make a method public that is called in a test.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8278851: Correct signer logic for jars signed with multiple digestalgs

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/262/head:pull/262
$ git checkout pull/262

Update a local copy of the PR:
$ git checkout pull/262
$ git pull https://git.openjdk.java.net/jdk17u-dev pull/262/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 262

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/262.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 17, 2022

👋 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.

@openjdk openjdk bot changed the title Backport 61b8944327e3d12cf58dc3f6bc45ecbeba4ef611 8278851: Correct signer logic for jars signed with multiple digestalgs Mar 17, 2022
@openjdk
Copy link

openjdk bot commented Mar 17, 2022

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Mar 17, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 17, 2022

Webrevs

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

8278851: Correct signer logic for jars signed with multiple digestalgs

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

  • 32148d2: 8276796: gc/TestSystemGC.java large pages subtest fails with ZGC
  • fbe05ec: 8280476: [macOS] : hotspot arm64 bug exposed by latest clang

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 the ready Pull request is ready to be integrated label Mar 18, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

  • 32148d2: 8276796: gc/TestSystemGC.java large pages subtest fails with ZGC
  • fbe05ec: 8280476: [macOS] : hotspot arm64 bug exposed by latest clang

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 18, 2022

@GoeLin Pushed as commit cbe4973.

💡 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_8278851 branch March 18, 2022 12:24
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 integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants