X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FPkiUtils.java;h=94a9b1f45ca1cba17ae60186e8d8ba77a0631d8d;hb=2606b4b145577c4767c37c464e3f517e49a98100;hp=dbd0456654d6e7f70c6eab431ecaa0bbff24f9f1;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java
index dbd045665..94a9b1f45 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java
@@ -28,6 +28,8 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
  * implementations.
  */
 class PkiUtils {
+	final static String PKCS12 = "PKCS12";
+
 	private final static String SECURITY_PROVIDER;
 	static {
 		Security.addProvider(new BouncyCastleProvider());
@@ -59,9 +61,9 @@ class PkiUtils {
 		}
 	}
 
-	public static KeyStore getKeyStore(File keyStoreFile, char[] keyStorePassword) {
+	public static KeyStore getKeyStore(File keyStoreFile, char[] keyStorePassword, String keyStoreType) {
 		try {
-			KeyStore store = KeyStore.getInstance("JKS", SECURITY_PROVIDER);
+			KeyStore store = KeyStore.getInstance(keyStoreType, SECURITY_PROVIDER);
 			if (keyStoreFile.exists()) {
 				try (FileInputStream fis = new FileInputStream(keyStoreFile)) {
 					store.load(fis, keyStorePassword);