Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

8269039: Disable SHA-1 Signed JARs #389

Closed
wants to merge 2 commits into from

Conversation

alexeybakhtin
Copy link
Contributor

@alexeybakhtin alexeybakhtin commented Aug 16, 2022

Backport from JDK18 is not applied clean, resolved with help o JDK11 patch:

  • src/java.base/share/conf/security/java.security

    • is not applied clean because 13 mentions "include jdk.disabled.namedCurves" added by JDK-8233228
  • src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java

    • Some hunks did not apply because DISABLED_CHECK was renamed
to JAR_DISABLED_CHECK in 17 by JDK-8266225.

    • Other hunks patch methods not in 13: checkWeakKey(), checkWeakAlg()
as well as the calls to these methods.
  • test/jdk/java/security/Security/signedfirst/Dyn.sh
 and test/jdk/java/security/Security/signedfirst/Static.sh

    • Deleting did not apply because of SunOS declaration.
  • JAR files changes are not applied, copied from JDK11
  • test/jdk/sun/security/tools/jarsigner/CheckSignerCertChain.java
    • 
Patch skipped, test not in 13.
  • test/jdk/sun/security/tools/jarsigner/TimestampCheck.java

    • Resolved using JDK11 patch.
  • test/lib/jdk/test/lib/security/SecurityUtils.java

    • The change to this file was already backported.

All sun/security/tools/jarsigner java/security/Security/signedfirst tests passed


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 a CSR request to be approved

Issues

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 389

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 16, 2022

👋 Welcome back abakhtin! 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 6d91a3eb7bd1e1403cfb67f7eb8ce06d7e08e7a7 8269039: Disable SHA-1 Signed JARs Aug 16, 2022
@openjdk
Copy link

openjdk bot commented Aug 16, 2022

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

@openjdk openjdk bot added the backport label Aug 16, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 17, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 17, 2022

Webrevs

@alexeybakhtin
Copy link
Contributor Author

/csr

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Aug 17, 2022
@openjdk
Copy link

openjdk bot commented Aug 17, 2022

@alexeybakhtin has indicated that a compatibility and specification (CSR) request is needed for this pull request.

@alexeybakhtin please create a CSR request for issue JDK-8269039 with the correct fix version. This pull request cannot be integrated until the CSR request is approved.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Aug 17, 2022
@openjdk
Copy link

openjdk bot commented Aug 17, 2022

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

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

8269039: Disable SHA-1 Signed JARs

Reviewed-by: yan

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Aug 17, 2022
@alexeybakhtin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 17, 2022

Going to push as commit 79497f6.

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

openjdk bot commented Aug 17, 2022

@alexeybakhtin Pushed as commit 79497f6.

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

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