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

8139348: Deprecate 3DES and RC4 in Kerberos #312

Closed
wants to merge 1 commit into from

Conversation

kvergizova
Copy link
Contributor

@kvergizova kvergizova commented May 4, 2023

I'd like to backport JDK-8139348 to 8u for parity with Oracle 8u351.
CSR JDK-8262273 is approved for 8-pool.

11u patch doesn't apply cleanly, some tests need to be adjusted:

  • jdk/test/sun/security/krb5/auto/NewSalt.java
    • copyright years adjusted
    • "default_tgs_enctypes=aes128-sha1" changed to "default_tgs_enctypes=aes128-cts" since aes128-sha1 alias is not supported in 8u (JDK-8014628 is not backported to 8u)
  • jdk/test/sun/security/krb5/auto/W83.java
    • copyright years adjusted
    • compile tag hunk applied manually due to context difference
  • jdk/test/sun/security/krb5/etype/WeakCrypto.java
    • bug tag hunk applied manually due to context difference
    • List.of replaced with Arrays.asList
  • test/jdk/sun/security/krb5/tools/KtabCheck.java changes applied to jdk/test/sun/security/krb5/tools/ktcheck.sh (JDK-8180569 is not backported to 8u)
    • additionally, aes128-sha2 (19) values are removed since it is not supported in 8u (JDK-8014628 is not in 8u)
  • jdk/test/sun/security/krb5/tools/onlythree.conf
    • aes128-sha2 removed from default_tkt_enctypes since it is not supported in 8u (JDK-8014628 is not in 8u)

Tested with jdk_security and tier1, no regressions.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 312

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 4, 2023

👋 Welcome back evergizova! 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 ded96ddcde1e9e8556a6ce8948acef27b6e192cc 8139348: Deprecate 3DES and RC4 in Kerberos May 4, 2023
@openjdk
Copy link

openjdk bot commented May 4, 2023

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 May 4, 2023
@mlbridge
Copy link

mlbridge bot commented May 4, 2023

Webrevs

@jerboaa
Copy link
Contributor

jerboaa commented May 4, 2023

FYI @gnu-andrew I think you've looked into that as well...

@kvergizova
Copy link
Contributor Author

Could anyone review this backport please?

@gnu-andrew
Copy link
Member

Yes, I'll take a look. As Severin says, I was planning to do this one too, so thanks for taking it on.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Changes look good to me. I'll add my usual proviso that Arrays.asList is modifiable while the original List.of method isn't, but this doesn't matter for a test that only calls three read only methods on the result.

JDK-8180569 might be worth looking at for backport, but isn't a pre-requisite for this.

Please flag with jdk8u-fix-request for approval.

@openjdk
Copy link

openjdk bot commented Jun 1, 2023

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

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

8139348: Deprecate 3DES and RC4 in Kerberos

Reviewed-by: andrew

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 14 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 1, 2023
@kvergizova
Copy link
Contributor Author

Thanks for the review, @gnu-andrew!

@gnu-andrew
Copy link
Member

No problem, sorry for the delay. I only just saw this today.

I've approved the bug. If you integrate, I can sponsor the commit and we can get this one in. Thanks for the backport :)

@kvergizova
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 1, 2023
@openjdk
Copy link

openjdk bot commented Jun 1, 2023

@kvergizova
Your change (at version 46abda6) is now ready to be sponsored by a Committer.

@gnu-andrew
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 2, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 2, 2023

@gnu-andrew @kvergizova Pushed as commit 6244292.

💡 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
Labels
backport integrated Pull request has been integrated
3 participants