crypto: default keystore is pkcs12 if no file ext

Author: mgiannini

src/crypto/fan/Crypto.fan

@@ -101,6 +101,7 @@ const mixin Crypto
   **  - '.p12', '.pfx': PKCS12 format
   **  - '.jks': Java KeyStore (JAVA only)
   **
+  ** If the file does not have an extension, then PKCS12 format will be assumed.
   ** Other formats may be supported depending on the runtime implementation. Throws
   ** an Err if the format is not supported or there is a problem loading the keystore.
   **

src/cryptoJava/java/JKeyStorePeer.java

@@ -34,20 +34,29 @@ public class JKeyStorePeer
 
   public static JKeyStore load(File file, Map opts)
   {
-    String format = null;
-    String ext = "p12";
-    if (file != null) ext = file.ext();
-    switch(ext)
+    // format option trumps file extension
+    String format = (String)opts.get("format");
+    if (format == null)
     {
-      case "p12":
-      case "pfx":
-        format = "pkcs12";
-        break;
-      case "jks":
-        format = "jks";
-        break;
-      default:
-        throw UnsupportedErr.make("Unsupported file ext: " + file.ext());
+      String ext = "p12";
+      if (file != null)
+      {
+        // If the file doesn't have an extension, then default is pkcs12
+        ext = file.ext();
+        if (ext == null) ext = "p12";
+      }
+      switch(ext)
+      {
+        case "p12":
+        case "pfx":
+          format = "pkcs12";
+          break;
+        case "jks":
+          format = "jks";
+          break;
+        default:
+          throw UnsupportedErr.make("Unsupported file ext: " + file.ext());
+      }
     }
     return file == null
       ? JKeyStore.make(format, ConcurrentMap.make())