1 files changed, 46 insertions, 24 deletions
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_keys_generator.sh b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_keys_generator.sh
index e88ff8965..ef66bd0b4 100755..100644
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_keys_generator.sh
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_keys_generator.sh
@@ -1,27 +1,49 @@
-!/bin/bash
+#!/bin/bash
 echo 'Generating credetials for FTPES server and DFC client...'
 
-echo 'FTPES'
-#ganerate certificate&privatekey
-openssl req -x509 -days 365 -newkey rsa:2048 -keyout ftp.key -out ftp.crt -subj "/C=PL/ST=Dolny Slask/L=Wroclaw/O=Root Company/OU=IT Department/CN=Nokia" --passout pass:secret
-#create a jks keystore for TrustManager
-keytool -keystore ftp.jks -genkey -alias ftp -storepass secret -keypass secret -dname "CN=Nokia, OU=IT Department, O=Root Company, L=Wroclaw, ST=Dolny Slask, C=PL"
-#convert your certificate in a DER format :
-openssl x509 -outform der -in ftp.crt -out ftp.der
-#and after, import it in the keystore :
-keytool -import -alias ftep -keystore ftp.jks -file ftp.der -storepass secret -keypass secret -dname "CN=Nokia, OU=IT Department, O=Root Company, L=Wroclaw, ST=Dolny Slask, C=PL"
+#ganerate certificate&privatekey (vsftpd.crt, vsftpd.key) with password: secret
+openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout vsftpd.key -out vsftpd.crt -subj "/C=PL/ST=Dolny Slask/L=Wroclaw/O=Root Company/OU=IT Department/CN=Nokia"
+#convert crt to pem
+openssl x509 -in vsftpd.crt -out vsftpd_crt.pem -outform PEM
+#convert key to pem
+openssl rsa -in vsftpd.key -out vsftpd_key.pem -outform PEM
+#marge key and cert into one pem file
+cat vsftpd_key.pem vsftpd_crt.pem > vsftpd.pem
 
-echo 'DFC client'
-#ganerate certificate&privatekey
-openssl req -x509 -days 365 -newkey rsa:2048 -keyout dfc.key -out dfc.crt -subj "/C=PL/ST=Dolny Slask/L=Wroclaw/O=Root Company/OU=IT Department/CN=Nokia"
-#create a jks keystore for TrustManager
-keytool -keystore dfc.jks -genkey -alias dfc -storepass secret -keypass secret -dname "CN=root.com, OU=Root Org, O=Root Company, L=Wroclaw, ST=Dolny Slask, C=PL"
-#import client.crt and client.key to p12
-openssl pkcs12 -export -in dfc.crt -inkey dfc.key \
-               -out dfc.p12 -name dfc
-#keystore
-keytool -importkeystore \
-        -deststorepass secret -destkeypass secret -destkeystore dfc.jks \
-        -srckeystore dfc.p12 -srcstoretype PKCS12 -srcstorepass secret \
-        -alias dfc     
-echo 'Finished'
-\ No newline at end of file
+#generate keystore
+openssl pkcs12 -export -out cert.pkcs12 -in vsftpd_crt.pem -inkey vsftpd_key.pem
+java -cp ./jetty-6.1.26.jar org.mortbay.jetty.security.PKCS12Import cert.pkcs12 keystore.jks
+
+#generate truststore
+openssl x509 -in vsftpd_crt.pem -out cert.der -outform der
+keytool -importcert -alias cert -file cert.der -keystore truststore.jks
+
+sudo chown root *
+sudo chmod 664 *
+
+echo "You have generated your key in the keystore, and your certificate in the truststore."
+
+##WITH PASSPHRASE
+#echo 'Generating credetials for FTPES server and DFC client...'
+#
+##ganerate certificate&privatekey (vsftpd.crt, vsftpd.key) with password: secret
+#openssl req -x509 -days 365 -newkey rsa:2048 -keyout vsftpd.key -out vsftpd.crt -subj "/C=PL/ST=Dolny Slask/L=Wroclaw/O=Root Company/OU=IT Department/CN=Nokia" --passout pass:secret
+##convert crt to pem
+#openssl x509 -in vsftpd.crt -out vsftpd_crt.pem -outform PEM
+##convert key to pem
+#openssl rsa -in vsftpd.key -out vsftpd_key.pem -outform PEM -passin pass:secret
+##marge key and cert into one pem file
+#cat vsftpd_key.pem vsftpd_crt.pem > vsftpd.pem
+#
+##generate keystore
+#openssl pkcs12 -export -out cert.pkcs12 -in vsftpd_crt.pem -inkey vsftpd_key.pem -passout pass:secret
+#java -cp ./jetty-6.1.26.jar org.mortbay.jetty.security.PKCS12Import cert.pkcs12 keystore.jks
+#
+##generate truststore
+#openssl x509 -in vsftpd_crt.pem -out cert.der -outform der
+#keytool -importcert -alias cert -file cert.der -keystore truststore.jks -storepass secret
+#
+#sudo chown root *
+#sudo chmod 664 *
+#
+#echo "You have generated your key in the keystore, and your certificate in the truststore."
+\ No newline at end of file