archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8266400: importkeystore fails to a password less pkcs12 keystore

Browse source 
Reviewed-by: weijun
This commit is contained in:
Hai-May Chao 2021-05-24 15:38:32 +00:00
parent f5562f1214
commit f2d880c11a
2 changed files with 92 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/share/classes/sun/security/tools/keytool/Main.java
View file

@ -2429,8 +2429,15 @@ public final class Main {
newPass = destKeyPass;
pp = new PasswordProtection(destKeyPass);
} else if (objs.snd != null) {
newPass = P12KEYSTORE.equalsIgnoreCase(storetype) ?
storePass : objs.snd;
if (P12KEYSTORE.equalsIgnoreCase(storetype)) {
if (isPasswordlessKeyStore) {
newPass = objs.snd;
} else {
newPass = storePass;
}
} else {
newPass = objs.snd;
}
pp = new PasswordProtection(newPass);
}
@ -2442,7 +2449,7 @@ public final class Main {
keyStore.setEntry(newAlias, entry, pp);
// Place the check so that only successful imports are blocked.
// For example, we don't block a failed SecretEntry import.
if (P12KEYSTORE.equalsIgnoreCase(storetype)) {
if (P12KEYSTORE.equalsIgnoreCase(storetype) && !isPasswordlessKeyStore) {
if (newPass != null && !Arrays.equals(newPass, storePass)) {
throw new Exception(rb.getString(
"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified."));