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

8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias #3326

Closed
wants to merge 1 commit into from

Conversation

@XueleiFan
Copy link
Member

@XueleiFan XueleiFan commented Apr 2, 2021

In X509KeyManagerImpl.java, a composited entry alias consists three parts: an UID counter, a builder index and the real entry alias (See the makeAlias() method). While calling the KeyStore.Builder.getProtectionParameter(String alias) method, the real entry alias should be used instead, rather than the composited entry alias.

Simple and straightforward update, no new regression test.


Progress

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

Issue

  • JDK-8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3326

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 2, 2021

👋 Welcome back xuelei! 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 8264554: X509KeyManagerImpl calls getProtectionParameter with incorre… 8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias Apr 2, 2021
@openjdk openjdk bot added the rfr label Apr 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 2, 2021

@XueleiFan 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 label Apr 2, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 2, 2021

Webrevs

@XueleiFan
Copy link
Member Author

@XueleiFan XueleiFan commented Apr 5, 2021

ping ...

@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

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

8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias

Reviewed-by: mullan

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

  • 114e3c3: 8263856: Github Actions for macos/aarch64 cross-build
  • a611c46: 8264048: Fix caching in Jar URL connections when an entry is missing
  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt
  • 8132548: 8264359: Compiler directives should enable DebugNonSafepoints when PrintAssembly is requested
  • ec7b002: 8264626: C1 should be able to inline excluded methods
  • ff22353: 8264565: Templatize num_arguments() functions of DCmd subclasses
  • 54b4070: 8264634: CollectCLDClosure collects duplicated CLDs when dumping dynamic archive
  • 43d4a6f: 8264564: AArch64: use MOVI instead of FMOV to zero FP register
  • dc608fd: 8264411: serviceability/jvmti/HeapMonitor tests intermittently fail due to large TLAB size
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/f60e81bf7b4cb2a0ba569c8935c4e4eb0510d5f2...master

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 label Apr 6, 2021
@XueleiFan
Copy link
Member Author

@XueleiFan XueleiFan commented Apr 6, 2021

/integrate

@openjdk openjdk bot closed this Apr 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

@XueleiFan Since your change was applied there have been 34 commits pushed to the master branch:

  • 114e3c3: 8263856: Github Actions for macos/aarch64 cross-build
  • a611c46: 8264048: Fix caching in Jar URL connections when an entry is missing
  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt
  • 8132548: 8264359: Compiler directives should enable DebugNonSafepoints when PrintAssembly is requested
  • ec7b002: 8264626: C1 should be able to inline excluded methods
  • ff22353: 8264565: Templatize num_arguments() functions of DCmd subclasses
  • 54b4070: 8264634: CollectCLDClosure collects duplicated CLDs when dumping dynamic archive
  • 43d4a6f: 8264564: AArch64: use MOVI instead of FMOV to zero FP register
  • dc608fd: 8264411: serviceability/jvmti/HeapMonitor tests intermittently fail due to large TLAB size
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/f60e81bf7b4cb2a0ba569c8935c4e4eb0510d5f2...master

Your commit was automatically rebased without conflicts.

Pushed as commit 2f51699.

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

@XueleiFan XueleiFan deleted the XueleiFan:JDK-8264554 branch Apr 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants