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

8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified #3764

Closed
wants to merge 2 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented Apr 28, 2021

It's awkward that for a password-less pkcs12 keystore, keytool -list does not prompt for a password but keytool -list -storetype pkcs12 does.


Progress

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

Issue

  • JDK-8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3764

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

Using diff file

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

…kcs12 file if -storetype pkcs12 is specified

8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 28, 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 label Apr 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 28, 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 label Apr 28, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 28, 2021

Webrevs

@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Apr 29, 2021

Test sun/security/tools/keytool/KeyToolTest.java failed on Windows. Looks like a file-not-closed issue. Will investigate if related to this code change.

@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Apr 29, 2021

New commit pushed. When the file is opened the second time, uses a local variable and close it quickly. The ksStream global variable is only assigned once and is always closed in a finally block.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 30, 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:

8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified

Reviewed-by: coffeys, hchao

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

  • 07ecd42: 8258602: JavaDoc field summary does not indicate final modifier
  • 276a1bf: 8236671: NullPointerException in JKS keystore
  • e9370a1: 8265761: Font with missed font family name is not properly printed on Windows
  • 3554dc2: 8264395: WB_EnqueueInitializerForCompilation fails with "method holder must be initialized" when called for uninitialized class
  • 4d77171: 8249903: jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java needs to be updated after 8146022 got closed
  • 51b2188: 8266267: Remove unnecessary jumps in Intel Math Library StubRoutines
  • 2c381e0: 8262376: ReplaceCriticalClassesForSubgraphs.java fails if --with-build-jdk is used
  • 5ecef01: 8266217: ZGC: Improve the -Xlog:gc+init output for NUMA
  • 5d8c1cc: 8255410: Add ChaCha20 and Poly1305 support to SunPKCS11 provider
  • 46b4a14: 8266315: Problem list failing test java/awt/font/TextLayout/LigatureCaretTest.java
  • ... and 75 more: https://git.openjdk.java.net/jdk/compare/ab2aec2afbab881ee7c97ad634ac1ded2aa03b73...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 30, 2021
@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Apr 30, 2021

/integrate

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

@openjdk openjdk bot commented Apr 30, 2021

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

  • 87de5b7: 8266040: Lanai: Incorrect calculations of clipping boundaries
  • eb8db12: 8263396: Atomic::CmpxchgByteUsingInt::set_byte_in_int needs an explicit cast
  • 07ecd42: 8258602: JavaDoc field summary does not indicate final modifier
  • 276a1bf: 8236671: NullPointerException in JKS keystore
  • e9370a1: 8265761: Font with missed font family name is not properly printed on Windows
  • 3554dc2: 8264395: WB_EnqueueInitializerForCompilation fails with "method holder must be initialized" when called for uninitialized class
  • 4d77171: 8249903: jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java needs to be updated after 8146022 got closed
  • 51b2188: 8266267: Remove unnecessary jumps in Intel Math Library StubRoutines
  • 2c381e0: 8262376: ReplaceCriticalClassesForSubgraphs.java fails if --with-build-jdk is used
  • 5ecef01: 8266217: ZGC: Improve the -Xlog:gc+init output for NUMA
  • ... and 77 more: https://git.openjdk.java.net/jdk/compare/ab2aec2afbab881ee7c97ad634ac1ded2aa03b73...master

Your commit was automatically rebased without conflicts.

Pushed as commit 48bb996.

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

@wangweij wangweij deleted the 8266220 branch Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated security
3 participants