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

8274656: Remove default_checksum and safe_checksum_type from krb5.conf #5788

Closed
wants to merge 3 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented Oct 1, 2021

Remove support for the 2 settings. Remove classes around the KRB_PRIV and KRB_SAFE message types that were never used in Java.


Progress

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

Issue

  • JDK-8274656: Remove default_checksum and safe_checksum_type from krb5.conf

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5788/head:pull/5788
$ git checkout pull/5788

Update a local copy of the PR:
$ git checkout pull/5788
$ git pull https://git.openjdk.java.net/jdk pull/5788/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5788

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5788.diff

8274656: Remove default_checksum and safe_checksum_type from krb5.conf
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 1, 2021

👋 Welcome back weijun! 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 added the rfr Pull request is ready for review label Oct 1, 2021
@openjdk
Copy link

openjdk bot commented Oct 1, 2021

@wangweij 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 Oct 1, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 1, 2021

Webrevs

@wangweij
Copy link
Contributor Author

wangweij commented Oct 4, 2021

/csr

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Oct 4, 2021
@openjdk
Copy link

openjdk bot commented Oct 4, 2021

@wangweij this pull request will not be integrated until the CSR request JDK-8274657 for issue JDK-8274656 has been approved.

@@ -73,56 +73,7 @@
// draft-brezak-win2k-krb-rc4-hmac-04.txt
public static final int CKSUMTYPE_HMAC_MD5_ARCFOUR = -138;

Choose a reason for hiding this comment

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

nit: How about updating and fixing the copyright years?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will update it in the next commit.

Comment on lines 319 to 320
// if the checksum type is one of the keyed checksum types,
// use session key.

Choose a reason for hiding this comment

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

nit: does this comment need updating?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will remove it. I think there is no need to explain why -1 is used.

Choose a reason for hiding this comment

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

Sure

@valeriepeng
Copy link

Do we still need all the constants defined in sun/security/krb5/internal/cryptoKeyUsage.java now that the corresponding classes are removed?

@wangweij
Copy link
Contributor Author

wangweij commented Oct 4, 2021

Do we still need all the constants defined in sun/security/krb5/internal/cryptoKeyUsage.java now that the corresponding classes are removed?

I haven't touched this file, and I also haven't cleaned up constants in sun/security/krb5/internal/Krb5.java. I thought they can just be left there as placeholders.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Oct 5, 2021
Copy link

@valeriepeng valeriepeng left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks.

@openjdk
Copy link

openjdk bot commented Oct 5, 2021

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

8274656: Remove default_checksum and safe_checksum_type from krb5.conf

Reviewed-by: valeriep

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

➡️ 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 Oct 5, 2021
@wangweij
Copy link
Contributor Author

wangweij commented Oct 5, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Oct 5, 2021

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 5, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 5, 2021
@openjdk
Copy link

openjdk bot commented Oct 5, 2021

@wangweij Pushed as commit 1e75203.

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

@wangweij wangweij deleted the 8274656 branch October 5, 2021 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
2 participants