jdk-sandbox: comparison jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java

equal deleted inserted replaced

-:0cbef7c46996
+:47080f9ae750
 // please programtically add any providers you need and do not specify
 // them through the command line.
 private Set<Pair <String, String>> providers = null;
 private String storetype = null;
+private boolean hasStoretypeOption = false;
 private String srcProviderName = null;
 private String providerName = null;
 private String pathlist = null;
 private char[] storePass = null;
 private char[] storePassNew = null;
 storePass = getPass(modifier, args[++i]);
 passwords.add(storePass);
 } else if (collator.compare(flags, "-storetype") == 0 ||
 collator.compare(flags, "-deststoretype") == 0) {
 storetype = args[++i];
+hasStoretypeOption = true;
 } else if (collator.compare(flags, "-srcstorepass") == 0) {
 srcstorePass = getPass(modifier, args[++i]);
 passwords.add(srcstorePass);
 } else if (collator.compare(flags, "-srcstoretype") == 0) {
 srcstoretype = args[++i];
+hasStoretypeOption = true;
 } else if (collator.compare(flags, "-srckeypass") == 0) {
 srckeyPass = getPass(modifier, args[++i]);
 passwords.add(srckeyPass);
 } else if (collator.compare(flags, "-srcprovidername") == 0) {
 srcProviderName = args[++i];
 throw new Exception(rb.getString("Must.specify.alias"));
 }
 }
 // Create new keystore
-if (providerName == null) {
+// Probe for keystore type when filename is available
-keyStore = KeyStore.getInstance(storetype);
+if (ksfile != null && ksStream != null && providerName == null &&
+hasStoretypeOption == false) {
+keyStore = KeyStore.getInstance(ksfile, storePass);
 } else {
-keyStore = KeyStore.getInstance(storetype, providerName);
+if (providerName == null) {
-}
+keyStore = KeyStore.getInstance(storetype);
+} else {
-/*
+keyStore = KeyStore.getInstance(storetype, providerName);
-* Load the keystore data.
+}
-*
-* At this point, it's OK if no keystore password has been provided.
+/*
-* We want to make sure that we can load the keystore data, i.e.,
+* Load the keystore data.
-* the keystore data has the right format. If we cannot load the
+*
-* keystore, why bother asking the user for his or her password?
+* At this point, it's OK if no keystore password has been provided.
-* Only if we were able to load the keystore, and no keystore
+* We want to make sure that we can load the keystore data, i.e.,
-* password has been provided, will we prompt the user for the
+* the keystore data has the right format. If we cannot load the
-* keystore password to verify the keystore integrity.
+* keystore, why bother asking the user for his or her password?
-* This means that the keystore is loaded twice: first load operation
+* Only if we were able to load the keystore, and no keystore
-* checks the keystore format, second load operation verifies the
+* password has been provided, will we prompt the user for the
-* keystore integrity.
+* keystore password to verify the keystore integrity.
-*
+* This means that the keystore is loaded twice: first load operation
-* If the keystore password has already been provided (at the
+* checks the keystore format, second load operation verifies the
-* command line), however, the keystore is loaded only once, and the
+* keystore integrity.
-* keystore format and integrity are checked "at the same time".
+*
-*
+* If the keystore password has already been provided (at the
-* Null stream keystores are loaded later.
+* command line), however, the keystore is loaded only once, and the
-*/
+* keystore format and integrity are checked "at the same time".
-if (!nullStream) {
+*
-keyStore.load(ksStream, storePass);
+* Null stream keystores are loaded later.
-if (ksStream != null) {
+*/
-ksStream.close();
+if (!nullStream) {
+keyStore.load(ksStream, storePass);
+if (ksStream != null) {
+ksStream.close();
+}
 }
 }
 // All commands that create or modify the keystore require a keystore
 // password.
 */
 KeyStore loadSourceKeyStore() throws Exception {
 boolean isPkcs11 = false;
 InputStream is = null;
+File srcksfile = null;
 if (P11KEYSTORE.equalsIgnoreCase(srcstoretype) ||
 KeyStoreUtil.isWindowsKeyStore(srcstoretype)) {
 if (!NONE.equals(srcksfname)) {
 System.err.println(MessageFormat.format(rb.getString
 tinyHelp();
 }
 isPkcs11 = true;
 } else {
 if (srcksfname != null) {
-File srcksfile = new File(srcksfname);
+srcksfile = new File(srcksfname);
 if (srcksfile.exists() && srcksfile.length() == 0) {
 throw new Exception(rb.getString
 ("Source.keystore.file.exists.but.is.empty.") +
 srcksfname);
 }
 }
 }
 KeyStore store;
 try {
-if (srcProviderName == null) {
+// Probe for keystore type when filename is available
-store = KeyStore.getInstance(srcstoretype);
+if (srcksfile != null && is != null && srcProviderName == null &&
+hasStoretypeOption == false) {
+store = KeyStore.getInstance(srcksfile, srcstorePass);
 } else {
-store = KeyStore.getInstance(srcstoretype, srcProviderName);
+if (srcProviderName == null) {
+store = KeyStore.getInstance(srcstoretype);
+} else {
+store = KeyStore.getInstance(srcstoretype, srcProviderName);
+}
 }
 if (srcstorePass == null
 && !srcprotectedPath
 && !KeyStoreUtil.isWindowsKeyStore(srcstoretype)) {

changeset 28243	47080f9ae750
parent 27344	890be6336eab
child 29110	ea89fdd8a5d5