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

8279164: Disable TLS_ECDH_* cipher suites #2763

Closed
wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 11, 2024

Backport of JDK-8279164. The version from 17u applies almost cleanly. Only java.security needed manual integration. The modified tests have passed.


Progress

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

Issues

  • JDK-8279164: Disable TLS_ECDH_* cipher suites (Enhancement - P3 - Approved)
  • JDK-8332812: Disable TLS_ECDH_* cipher suites (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2763

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 11, 2024

👋 Welcome back mdoerr! 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 Jun 11, 2024

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

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

8279164: Disable TLS_ECDH_* cipher suites

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

  • c9cc14b: 8333837: [11u] HexPrinterTest.java javac compile fails illegal start of expression
  • f343625: 8333839: [11u] LingeredAppTest.java fails Can't find source file: LingeredApp.java
  • 316cd2f: 7124313: [macosx] Swing Popups should overlap taskbar
  • 54bf522: 8307091: A few client tests intermittently throw ConcurrentModificationException
  • 2ded016: 8329995: Restricted access to /proc can cause JFR initialization to crash

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 changed the title Backport 7bc22f7c55d99c5f0a7f559187c0d1ecab199969 8279164: Disable TLS_ECDH_* cipher suites Jun 11, 2024
@openjdk
Copy link

openjdk bot commented Jun 11, 2024

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 11, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 11, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 11, 2024

⚠️ @TheRealMDoerr This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!

@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Jun 12, 2024

/approval request Should get backported for parity with 11.0.25-oracle. The backport has been reviewed and tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 12, 2024

@TheRealMDoerr
8279164: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 12, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 13, 2024

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

  • be6c621: 8305072: Win32ShellFolder2.compareTo is inconsistent
  • 9a2a828: 8315437: Enable parallelism in vmTestbase/nsk/monitoring/stress/classload tests
  • 46b15b9: 8315442: Enable parallelism in vmTestbase/nsk/monitoring/stress/thread tests
  • c9cc14b: 8333837: [11u] HexPrinterTest.java javac compile fails illegal start of expression
  • f343625: 8333839: [11u] LingeredAppTest.java fails Can't find source file: LingeredApp.java
  • 316cd2f: 7124313: [macosx] Swing Popups should overlap taskbar
  • 54bf522: 8307091: A few client tests intermittently throw ConcurrentModificationException
  • 2ded016: 8329995: Restricted access to /proc can cause JFR initialization to crash

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 13, 2024

@TheRealMDoerr Pushed as commit 5dddf69.

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

@TheRealMDoerr TheRealMDoerr deleted the 8279164_TLS_ECDH branch June 13, 2024 08:03
@martinuy
Copy link
Contributor

Hi,

I'm a bit late here but want to ask if adding SSL_RSA_WITH_3DES_EDE_CBC_SHA to disabled_ciphersuites (DisabledAlgorithms.java) was a mistake, considering that 8163327 has not been backported to 11u.

Thanks.-

@TheRealMDoerr
Copy link
Contributor Author

Hi,

I'm a bit late here but want to ask if adding SSL_RSA_WITH_3DES_EDE_CBC_SHA to disabled_ciphersuites (DisabledAlgorithms.java) was a mistake, considering that 8163327 has not been backported to 11u.

Thanks.-

See openjdk/jdk17u-dev#2559 (comment).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants