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
8262186: Call X509KeyManager.chooseClientAlias once for all key types #1885
Conversation
👋 Welcome back goetz! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
@GoeLin This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration! |
@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:
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 95 new commits pushed to the
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 |
/integrate |
Going to push as commit 2a37bae.
Your commit was automatically rebased without conflicts. |
I backport this for parity with 17.0.10-oracle.
The first commit contains the parts applied clean.
The second one contains two chunks I had to resolve, and some additional adaptions.
I had to resolve CertificateRequest.java because "8268199: Correct certificate requests" was already backported to 17, but was applied in head after this change.
This block was in the way of a clean patch:
17u:
Actually, this block was adapted in the backport of 8268199 because this change, 8262186, was not in 17 at that time.
Also, the adapted code does not compile any more because X509PossessionGenerator is removed by this change.
Thus I changed it to the original code of "8268199: Correct certificate requests":
After some further related adaptions the code looks the same in 17 as in head if going back to "8268199: Correct certificate requests".
This is expected as both repos contain the same changes for both resolved files at that point:
17: https://github.com/openjdk/jdk17u-dev/commits/master/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
head: https://github.com/openjdk/jdk/commits/master/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
("8271730: Client authentication using RSASSA-PSS ..." brings a chunk to 17 that was lost in the backport of "8268199: Correct certificate requests").
In X509Authentication.java a larger chunk did not apply because the backport of "8268199: Correct certificate requests" removed private statements from the decl of X509PossessionGenerator. The chunk applies clean after undoing this change.
The original issue has a CSR, the backport to 17.0.10-oracle does not. I am investigating why.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1885/head:pull/1885
$ git checkout pull/1885
Update a local copy of the PR:
$ git checkout pull/1885
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1885/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1885
View PR using the GUI difftool:
$ git pr show -t 1885
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1885.diff
Webrev
Link to Webrev Comment