< prev index next >

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

Print this page
rev 55964 : 8162628: Migrate cacerts keystore from JKS

*** 934,943 **** --- 934,945 ---- storetype == null && !inplaceImport) { keyStore = KeyStore.getInstance(ksfile, storePass); storetype = keyStore.getType(); if (storetype.equalsIgnoreCase("pkcs12")) { isPasswordlessKeyStore = PKCS12KeyStore.isPasswordless(ksfile); + } else if (storetype.equalsIgnoreCase("pem")) { + isPasswordlessKeyStore = true; } } else { if (storetype == null) { storetype = KeyStore.getDefaultType(); }
*** 2193,2202 **** --- 2195,2206 ---- srcstoretype == null) { store = KeyStore.getInstance(srcksfile, srcstorePass); srcstoretype = store.getType(); if (srcstoretype.equalsIgnoreCase("pkcs12")) { srcIsPasswordless = PKCS12KeyStore.isPasswordless(srcksfile); + } else if (srcstoretype.equalsIgnoreCase("pem")) { + srcIsPasswordless = true; } } else { if (srcstoretype == null) { srcstoretype = KeyStore.getDefaultType(); }
< prev index next >