FIX: The JKS keystore uses a proprietary format. Switch to PCKS12

Upgrade JKS to PKCS12 : keytool -importkeystore -srckeystore drftpd3\userdata\drftpd.key -destkeystore drftpd3\userdata\drftpd.key -deststoretype pkcs12".
drftpd-ng · Jun 20, 2018 · efc27b5 · efc27b5
1 parent b055cf8
commit efc27b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/genkey.bat b/genkey.bat
@@ -15,5 +15,5 @@ if not exist "%USERDATA_SLAVE%" (
     goto :eof
   )
 )
-keytool -genkeypair -keyalg EC -keysize 256 -sigalg SHA256withECDSA -alias drftpd -dname CN=drftpd -keypass drftpd -keystore "%USERDATA_MASTER%drftpd.key" -storepass drftpd
+keytool -genkeypair -keyalg EC -keysize 256 -sigalg SHA256withECDSA -alias drftpd -dname CN=drftpd -keypass drftpd -keystore "%USERDATA_MASTER%drftpd.key" -storetype pkcs12 -storepass drftpd
 copy /Y "%USERDATA_MASTER%drftpd.key" "%USERDATA_SLAVE%"
diff --git a/genkey.sh b/genkey.sh
@@ -5,5 +5,5 @@ SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
 mkdir -p "$SCRIPTPATH/userdata"
 mkdir -p "$SCRIPTPATH/src/slave/resources/userdata"
-keytool -genkeypair -keyalg EC -keysize 256 -sigalg SHA256withECDSA -alias drftpd -dname CN=drftpd -keypass drftpd -keystore "$SCRIPTPATH/userdata/drftpd.key" -storepass drftpd "$@"
+keytool -genkeypair -keyalg EC -keysize 256 -sigalg SHA256withECDSA -alias drftpd -dname CN=drftpd -keypass drftpd -keystore "$SCRIPTPATH/userdata/drftpd.key" -storetype pkcs12 -storepass drftpd "$@"
 cp "$SCRIPTPATH/userdata/drftpd.key" "$SCRIPTPATH/src/slave/resources/userdata/"
diff --git a/src/slave/src/org/drftpd/SSLGetContext.java b/src/slave/src/org/drftpd/SSLGetContext.java
@@ -60,7 +60,7 @@ public void checkServerTrusted(
 
 		KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
 
-		KeyStore ks = KeyStore.getInstance("JKS");
+		KeyStore ks = KeyStore.getInstance("PKCS12");
 		FileInputStream fis = null;
 		try {
 			fis = new FileInputStream("userdata/drftpd.key");