summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormicdzied <michal.1.dziedzic@nokia.com>2018-10-26 11:24:45 +0200
committermicdzied <michal.1.dziedzic@nokia.com>2018-10-26 11:29:31 +0200
commitb2e6ad0d06249feb6e9927237eaea7ed79205d0e (patch)
tree88cfd6fb3ff75232e041c78164a90c5eac3201ee
parent131f63d7741c5cf7b6ad2330b4f3bb91826b589c (diff)
modifications for FTPES vsftpd
Change-Id: Id25506a3661fc5ce5b8a48ba02d346338be1db19 Issue-ID: INT-702 Signed-off-by: micdzied <michal.1.dziedzic@nokia.com>
-rw-r--r--test/mocks/pnfsimulator/README.md10
-rw-r--r--test/mocks/pnfsimulator/docker-compose.yml11
-rw-r--r--test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt1
-rw-r--r--test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt1
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf11
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.derbin0 -> 962 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.pkcs12bin0 -> 2565 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.crt20
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.csr18
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.jksbin2529 -> 0 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key27
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12bin2492 -> 0 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.crt20
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.csr18
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.derbin848 -> 0 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.jksbin3209 -> 0 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key27
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/keystore.jksbin0 -> 2312 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/truststore.jksbin0 -> 1250 bytes
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.crt23
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.key28
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.pem50
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_crt.pem23
-rw-r--r--test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_key.pem27
-rw-r--r--[-rwxr-xr-x]test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_keys_generator.sh70
25 files changed, 219 insertions, 166 deletions
diff --git a/test/mocks/pnfsimulator/README.md b/test/mocks/pnfsimulator/README.md
index d1f2a0c11..e53d72fb7 100644
--- a/test/mocks/pnfsimulator/README.md
+++ b/test/mocks/pnfsimulator/README.md
@@ -52,8 +52,14 @@ After that execute *./simulator.sh stop* and when it's finished *./simulator.sh
In order to connect execute command *ftp -p localhost 2221* and, when requested, provide user and password.
In order to download a file execute, while still being logged in, *get file-name-to-be-downloaded*.
-###FTPES support for vsftpd server
-TBD
+###FTPES support for VSFTPD server
+PNF Simulator allows to serve files via FTPES VSFTPD server. VSFTPD server has predefined user *onap* with password *pano*.
+By default TLS support is enabled. Required certificates and keys are generated via vsftpd_certs_keys_generator.sh and located in ./ftpes/vsftpd/tls/ .
+We can generate our own certificates and keys using that script and passing 'secret' password when you are asked for entering keystore password. In other cases just press ENTER to go on.
+Configuration of VSFTPD server is located in ./ftpes/vsftpd/configuration/vsftpd_ssl.conf .
+Docker-compose contains VSFTPD server image with it's configurations.
+
+In order to verify connection, please use *FileZilla* for testing.
###Developer mode
For development of PNF Simulator, run *simulator.sh* start-dev in order to run minimal necessary set of supporting services such as Netopeer of FTP servers.
diff --git a/test/mocks/pnfsimulator/docker-compose.yml b/test/mocks/pnfsimulator/docker-compose.yml
index 2084c6cef..adaa3eb2c 100644
--- a/test/mocks/pnfsimulator/docker-compose.yml
+++ b/test/mocks/pnfsimulator/docker-compose.yml
@@ -52,7 +52,7 @@ services:
- ./ftpes/pure-ftpd/tls/:/etc/ssl/private/
environment:
PUBLICHOST: localhost
- ADDED_FLAGS: --tls=2 -d -d -O w3c:/var/log/pure-ftpd/transfer.log
+ ADDED_FLAGS: --tls=2
FTP_USER_HOME: onap
restart: on-failure
@@ -65,13 +65,14 @@ services:
environment:
FTP_USER: onap
FTP_PASSWORD: pano
- PASV_ADDRESS: 127.0.0.1
+ PASV_ADDRESS: localhost
PASV_MIN_PORT: 8001
PASV_MAX_PORT: 8010
volumes:
- - ./ftpes/vsftpd/tls/ftp.crt:/etc/ssl/private/vsftpd.crt:ro
- - ./ftpes/vsftpd/tls/ftp.key:/etc/ssl/private/vsftpd.key:ro
- - ./ftpes/vsftpd/tls/dfc.crt:/home/vsftpd/onap/client.crt:ro
+ - ./ftpes/vsftpd/tls/vsftpd.crt:/etc/ssl/private/vsftpd.crt:ro
+ - ./ftpes/vsftpd/tls/vsftpd.key:/etc/ssl/private/vsftpd.key:ro
- ./ftpes/vsftpd/configuration/vsftpd_ssl.conf:/etc/vsftpd_ssl.conf:ro
+ - ./ftpes/files/onap/ftpes-onap.txt:/home/vsftpd/onap/ftpes-onap.txt:ro
+ - ./ftpes/files/onap/ftpes-onap.txt:/srv/ftpes-onap.txt:ro
restart: on-failure
command: vsftpd /etc/vsftpd_ssl.conf
diff --git a/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt b/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt
index e69de29bb..3f1caaed7 100644
--- a/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt
+++ b/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt
@@ -0,0 +1 @@
+sample message \ No newline at end of file
diff --git a/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt b/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt
index e69de29bb..8e78dac41 100644
--- a/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt
+++ b/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt
@@ -0,0 +1 @@
+sample message v2 \ No newline at end of file
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf b/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf
index 6d94ad827..3e9cd7c66 100644
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf
@@ -39,8 +39,6 @@ pasv_max_port=8010
# SSL
ssl_enable=Yes
-rsa_cert_file=/etc/ssl/private/vsftpd.crt
-rsa_private_key_file=/etc/ssl/private/vsftpd.key
require_ssl_reuse=NO
force_local_data_ssl=YES
force_local_logins_ssl=YES
@@ -49,7 +47,10 @@ allow_anon_ssl=NO
ssl_tlsv1=YES
ssl_sslv2=YES
+ssl_sslv3=YES
+rsa_cert_file=/etc/ssl/private/vsftpd.crt
+rsa_private_key_file=/etc/ssl/private/vsftpd.key
-require_cert=YES
-ssl_request_cert=YES
-ca_certs_file=/home/vsftpd/onap/client.crt
+#require_cert=YES
+#ssl_request_cert=YES
+#ca_certs_file=/home/vsftpd/onap/client.crt \ No newline at end of file
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.der b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.der
new file mode 100644
index 000000000..24ac26c69
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.der
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.pkcs12 b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.pkcs12
new file mode 100644
index 000000000..3983e748a
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.pkcs12
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.crt b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.crt
deleted file mode 100644
index 9053acf6b..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTDCCAjQCCQC35XXwaJRpezANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQGEwJQ
-TDENMAsGA1UECAwEYWRhczEMMAoGA1UEBwwDYXNkMQwwCgYDVQQKDANhc2QxDDAK
-BgNVBAsMA2FzZDEMMAoGA1UEAwwDYXNkMRIwEAYJKoZIhvcNAQkBFgNhc2QwHhcN
-MTgxMDE5MTE1ODI3WhcNMTkxMDE5MTE1ODI3WjBoMQswCQYDVQQGEwJQTDENMAsG
-A1UECAwEYWRhczEMMAoGA1UEBwwDYXNkMQwwCgYDVQQKDANhc2QxDDAKBgNVBAsM
-A2FzZDEMMAoGA1UEAwwDYXNkMRIwEAYJKoZIhvcNAQkBFgNhc2QwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC81m2sWiO2tcv8huzFJWMovh6fsk2TZzli
-w0598BXUIaSmKeFe/i51FvON8QjYoTckjeuARxiQPHvD4cB68SXTQv0AqxId1DsA
-GZy8JE0FO29Cux7a0SEMdJUjkRxAcGrz2NOtbFxmaZDvtQVRoNbaaKIe9VKYbvfF
-jdIx/8qQiSHUahm9fdrJqH+HQaTIQPGBMWTF8WC3ptRxtyQ49nFjnhL19glviT1S
-0NpHTuX4h46dZX/X9bHdoPZF84Nl2yyFS+PK2lEzmQQE/uBXFxmKanEbxcF2ORo7
-LmebHfXL3Rc2jE7akhod5Vvg+nrSUc+JTcWeRxsA29C/OQoLh/l9AgMBAAEwDQYJ
-KoZIhvcNAQELBQADggEBADZw1bosIxPAjTPWPKO3h2BynrZqYQFbq3QttdCLoUIj
-YxUM/sR6fXju0WSSJrdvdN6nPzQ1dl+6mtppCVhavy6vZGzBN1IO1hWM2Z9yO2sa
-r4e2cw2S0rjm/+WXKOn2v8wIUmhFGCBpsXWGmVx+WjaE4BmPkb+qfN5G72H8eaap
-qD9RAMHoxM4+sXCSz2CDdiyUa7U0Oy85L/dMzua3VZjtQDwC7D9RpS5+qKhaTTUs
-wG9DbruD95tkjlXt1lvpxoFlCTvdXOGkviwG27K6XAfnoHRt1CU5Z0U+IGNTt9fj
-fKnQTEfeK4uYtOaeNNs84KNl9J6fcUNIOwHxwb3RLmw=
------END CERTIFICATE-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.csr b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.csr
deleted file mode 100644
index c4c098b28..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.csr
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIC2DCCAcACAQAwaDELMAkGA1UEBhMCUEwxDTALBgNVBAgMBGFkYXMxDDAKBgNV
-BAcMA2FzZDEMMAoGA1UECgwDYXNkMQwwCgYDVQQLDANhc2QxDDAKBgNVBAMMA2Fz
-ZDESMBAGCSqGSIb3DQEJARYDYXNkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvNZtrFojtrXL/IbsxSVjKL4en7JNk2c5YsNOffAV1CGkpinhXv4udRbz
-jfEI2KE3JI3rgEcYkDx7w+HAevEl00L9AKsSHdQ7ABmcvCRNBTtvQrse2tEhDHSV
-I5EcQHBq89jTrWxcZmmQ77UFUaDW2miiHvVSmG73xY3SMf/KkIkh1GoZvX3ayah/
-h0GkyEDxgTFkxfFgt6bUcbckOPZxY54S9fYJb4k9UtDaR07l+IeOnWV/1/Wx3aD2
-RfODZdsshUvjytpRM5kEBP7gVxcZimpxG8XBdjkaOy5nmx31y90XNoxO2pIaHeVb
-4Pp60lHPiU3FnkcbANvQvzkKC4f5fQIDAQABoCswEgYJKoZIhvcNAQkCMQUMA2Fz
-ZDAVBgkqhkiG9w0BCQcxCAwGc2VjcmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBAXSh3
-2aQ4Ypci4TGAsexRh/Jej5g5gUsHl8m8qLFA4gazcZqqK0x3nmgk6qI1UXdIitNc
-40bGtHDqTCg5IrEwnZ8s/82eT8juTkunuUYGsTfJpYn6wyP7iPnIOHOd7lA6N75y
-y8DLdiJIN3K9TF459wL0wviEsi6F5kDPrT9L9znkGOxXAUDUlvmYGAxET6y6IFTE
-bSx+DHWoXEbwoFfbx8e+QgSkw+ud2q5Yj2mrBqBpEgvXbSn3GAfR05oOcLIHqaq9
-Wh1qRdw25wrHM6iFPCcXZYPK4V7T6ZVrRIOsmiMImW9tID7WPLEgqfWpnhccF4gh
-rJRkQ3RSAYIg6bsM
------END CERTIFICATE REQUEST-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.jks b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.jks
deleted file mode 100644
index 717874690..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.jks
+++ /dev/null
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key
deleted file mode 100644
index cca071a53..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAvNZtrFojtrXL/IbsxSVjKL4en7JNk2c5YsNOffAV1CGkpinh
-Xv4udRbzjfEI2KE3JI3rgEcYkDx7w+HAevEl00L9AKsSHdQ7ABmcvCRNBTtvQrse
-2tEhDHSVI5EcQHBq89jTrWxcZmmQ77UFUaDW2miiHvVSmG73xY3SMf/KkIkh1GoZ
-vX3ayah/h0GkyEDxgTFkxfFgt6bUcbckOPZxY54S9fYJb4k9UtDaR07l+IeOnWV/
-1/Wx3aD2RfODZdsshUvjytpRM5kEBP7gVxcZimpxG8XBdjkaOy5nmx31y90XNoxO
-2pIaHeVb4Pp60lHPiU3FnkcbANvQvzkKC4f5fQIDAQABAoIBAC0/1JfwIY6ukWq5
-ihLTmqcwp3Xs69neaknYMv7KgPCL/0Ax2OdCUS+NiF8C2vPN7cC8oSnj32bwl1eg
-yNas4jt1WdrHI1gyetDTUlNi/3G5hDehTwtwAVNSvEoBg5uNVJOJ6W8tABcqRKir
-39JnkBRV7kMs1dXhAU49ZZjFimyHhbdWeme8zcqC4lqk5ZYcXgCiOSYUNjeV39XC
-aE/NlXS1d8dqnL/nXV3otvFMe7Ax/J+frlpALJGRCNlMNVT67c3pv+1FkXGPW/8q
-WvrTPsWPL5lqykD+isgiLMW5GXQzyw07Ohf+7BBZmn0bKWEkEVC590IZ2KQgN19Q
-jU80QaECgYEA9D3Kp3axg9IgvswpUOFjeCt0eviSRGlKNG0FEFT/mC00m88YUDw+
-iMi5nAPfnEiYi6Ql6ncvaohhMiHwlQQk51AKgsotSCJCwewO4UiAibqu47RoBXtR
-R/3cPOqnE0YziTeIgbRxEoKU1iycXkdugxX8yToYc/vFSIeKEr/nD2cCgYEAxe3M
-7pbBCLsCACbT/N4Ye9yUt5akKMOJPFLoGZe1COf8f2sp0QZc4IhtPIkE65VeC2yX
-5+XRxjI1CHBZzu7QcBmdfEZbawWWM0Ehpgf3TUmzpLzgvTj4D697TBOc2S0oMo9o
-4dT+7QOuw6vt2dTfm2cBCw/JibXIfQJ58W5K9XsCgYBCKkMuHq90QIZyaah/qq9h
-rJP/hDtLoSJjFW2bwQsE1Ko901qI0ek28PmnVD1NfzUkDzHeVK9Zstxx0lP0aoz8
-xOg0CkU+F1nyYtqdGSEJLrOWKBdN9NxOHm19aywbwpbPg2XNjW5cT1e2tZsex0ce
-5+P1N3HMadZGEcHL1oTn3QKBgBnLdQK/GOcnYApfBQ+WbkBuLd+DPV+mpBL9hwwW
-zlwbx7dfYvK/zojgnsPd44tESx5YB7AMLnuS/YBdDAdA7l89p12T2cQn1TxWx6jY
-ru0eps/YYb2nWATLTNlMUQuoq+1y7StJU/PVoAgWNwhFiuK42NT1OMG+tCM+mF/T
-jOdTAoGBAOkVlTCF3OKHhNWrzX5dQGHicCczaciaAJtXbYg10HDSzzIMf4ypzzv7
-QfbTB9rF5mZBjtr2s2/DZw9PQGd434ZFJ3z8wD2HvtH26HhxVmqJKo1mqsR6FArW
-GBPVq0LeUzfgQQahaeTkDC+nFvlq63AhUx+cAdNbb8VLEfih7Sns
------END RSA PRIVATE KEY-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12 b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12
deleted file mode 100644
index 2e9357ea3..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12
+++ /dev/null
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.crt b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.crt
deleted file mode 100644
index 497ad8703..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTDCCAjQCCQDQEPBXT/e7YDANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQGEwJQ
-TDEMMAoGA1UECAwDYXNkMQ0wCwYDVQQHDARhc2RhMQwwCgYDVQQKDANhc2QxDDAK
-BgNVBAsMA2FzZDEMMAoGA1UEAwwDYXNkMRIwEAYJKoZIhvcNAQkBFgNhc2QwHhcN
-MTgxMDE5MTE1ODU5WhcNMTkxMDE5MTE1ODU5WjBoMQswCQYDVQQGEwJQTDEMMAoG
-A1UECAwDYXNkMQ0wCwYDVQQHDARhc2RhMQwwCgYDVQQKDANhc2QxDDAKBgNVBAsM
-A2FzZDEMMAoGA1UEAwwDYXNkMRIwEAYJKoZIhvcNAQkBFgNhc2QwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDupZ7LgYA/qvwd0Spghdmz5oLPpZkIc0nI
-KRq80AQOtxH6bTRFRxU8xPvN5Jg2EOzjenLw6qhg1ybGZ5G7bSWW8WeEyuF+RlM1
-xBHiOsWRDzy2vvchnG7T+lcK/j7KtquJdd0qkiaZOfGW9+Yii/QwBGN/IkgjgsV6
-fTIsmlZYWxWtSjEYjnrF6YFmY63GuZkpJwcYkrlEbGsuZO6Q68Eew5A/e9JY7sdK
-qs8xU/yoNEaRAmqsffHmDbkLPtVbdjTtB93eT1j1zq1yEbMQKQxZWr2iUbLTFyXr
-FAlxPh8BD1OBuZIs0t92vn1agcdMPiyias+f8H2wBjgYeOz3DQgjAgMBAAEwDQYJ
-KoZIhvcNAQELBQADggEBAO2hBd0vYkWuAdE8dzqJXctMJL4ij26shSje1V2EfzEC
-i+m7azo+hPVc5T+lno9s6JgC9jrKRlaTTgY+pN8y05FP8sufU4Vw7yTnsJWVxgsd
-T0rh30Gl2Nl7lce3hD4zjWxysYBgJ+HnY8YpHI3KpkhxuwsPW51wwtNEVMlfXd6i
-myIdbw1nzJ4ZuY3IUjKwjcmspD3ewVnRJKLj0zeN/y13obr/Mu6NCdUo2qCsTTQS
-Ws2135DuPWDRMqJy8JuxTXmq6vdfhqQwE1jyxa3ovG+dn57jDpLTe5jOobKavB12
-IEOh2ea+LrVVBGs5XiCO7ZzZjJyn+R2AFw1ay3nM8RI=
------END CERTIFICATE-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.csr b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.csr
deleted file mode 100644
index b67e60b4a..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.csr
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIC2DCCAcACAQAwaDELMAkGA1UEBhMCUEwxDDAKBgNVBAgMA2FzZDENMAsGA1UE
-BwwEYXNkYTEMMAoGA1UECgwDYXNkMQwwCgYDVQQLDANhc2QxDDAKBgNVBAMMA2Fz
-ZDESMBAGCSqGSIb3DQEJARYDYXNkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA7qWey4GAP6r8HdEqYIXZs+aCz6WZCHNJyCkavNAEDrcR+m00RUcVPMT7
-zeSYNhDs43py8OqoYNcmxmeRu20llvFnhMrhfkZTNcQR4jrFkQ88tr73IZxu0/pX
-Cv4+yrariXXdKpImmTnxlvfmIov0MARjfyJII4LFen0yLJpWWFsVrUoxGI56xemB
-ZmOtxrmZKScHGJK5RGxrLmTukOvBHsOQP3vSWO7HSqrPMVP8qDRGkQJqrH3x5g25
-Cz7VW3Y07Qfd3k9Y9c6tchGzECkMWVq9olGy0xcl6xQJcT4fAQ9TgbmSLNLfdr59
-WoHHTD4somrPn/B9sAY4GHjs9w0IIwIDAQABoCswEgYJKoZIhvcNAQkCMQUMA2Fz
-ZDAVBgkqhkiG9w0BCQcxCAwGc2VjcmV0MA0GCSqGSIb3DQEBCwUAA4IBAQCKf1xL
-6lY7NdrzfkQGg9fwX2bCMU6d83WR3fCdHOu/ez8owdmVI6zC3F78UIjvSHnO2W/L
-vBYwcybSjoLlRTxrU9Dv/WqFfHdGvxON8pCpL243IKWsWpTgMJBPF3D45dOgnDP5
-xKl6g1UelyNqXPLEiwp01B0nrJSvV6LGBNmI8nAL6Uxs+RZL2qq/d3yfGouD4xDX
-a8ZXJe8zIrqB7CJnK7dzRWqWTpLyHNkOQm/Ru9YIQc62JRjKct9lxpcfRzJwyzDm
-x620sT6Y+Yqdthkhj5sF9hImIhhPWNN7OiFQ2Zu7NmcYHakuXYr3FovObMkMl1eQ
-OJUhqylUF2MHGnrK
------END CERTIFICATE REQUEST-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.der b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.der
deleted file mode 100644
index 4cc628ccb..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.der
+++ /dev/null
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.jks b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.jks
deleted file mode 100644
index e0e49057f..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.jks
+++ /dev/null
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key
deleted file mode 100644
index 575d98087..000000000
--- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA7qWey4GAP6r8HdEqYIXZs+aCz6WZCHNJyCkavNAEDrcR+m00
-RUcVPMT7zeSYNhDs43py8OqoYNcmxmeRu20llvFnhMrhfkZTNcQR4jrFkQ88tr73
-IZxu0/pXCv4+yrariXXdKpImmTnxlvfmIov0MARjfyJII4LFen0yLJpWWFsVrUox
-GI56xemBZmOtxrmZKScHGJK5RGxrLmTukOvBHsOQP3vSWO7HSqrPMVP8qDRGkQJq
-rH3x5g25Cz7VW3Y07Qfd3k9Y9c6tchGzECkMWVq9olGy0xcl6xQJcT4fAQ9TgbmS
-LNLfdr59WoHHTD4somrPn/B9sAY4GHjs9w0IIwIDAQABAoIBAD1l1OXsqm828WhG
-cQ2mQi1bp9n+c9HNv3TExoE/T1vt061HPUR5lkgtMc91+YcncZrQ3ROIe8t2bx5q
-dP7whNRBxW1PuRYAx9W0XRmEH2JDtk4Z8YDvO0BETvKgGM2Uk6to7H7QXSfc1YAO
-xWGr+iYEawjBbCfetCngXfFFv+M5BK2yh+dxw4ZLWscXwK4bbURE/YQUDhJADJsh
-+ljjvP6IOAehGlHnrR/SscP+d7GA4IFfwJpSY/C+2Py0GJWnlf+HeoFysENp7QIh
-xLtKAGHnc4Za1+ThLXm5PgT4bcrE6oqLAit/sLerWIaPERXEpnrWARwig8uzhgxH
-y3eyKikCgYEA/j/stGlggGlRM5HrFVhuSh56YdI9VmiAhI4wS4BmYPUpUe3Qwfyc
-EPtJ2msJNqJG2YLMVe6jVbjNaSLLDdaexD9kaUXv4rer4GmgPghITOnIFsBIgbQv
-Qn1eD6MWX0R5YCV1+s5Umth/cVwyFNjpjqI6YlSzEfKNQmALa/ylUf8CgYEA8Eoy
-wMfALNv/PlJE4r0ICuPVHIkwzuGZHD/Qteiait47JNwHUP6RfkcAIByLAJGxdAFo
-eUBxV7MTvS/H0/E+z6F8IYuliSD3cnc4tI4wxFtGmAl14glvnmSivi21xify7Sim
-FmmYF0qh+eGus8oDnL+UCw7ZCDpJbQAzNH58wd0CgYBoojAs8y0Wy8DyQzwHFdSV
-xkNBXL+HfwxdARNZDyeTAXIW2JNQMkCcMH5tWB17kX8s5spnFwW7Mom+meYM9OV0
-CE6vkGuv1zzx5yZeQRRYKuIAkvOEBX5pk6SRNOHxJQH6kpAiPqXM8ApKwdGOiNJd
-s9/pNchYO4Ts6w/oShpTSwKBgBoaBT9Zs29sCmLrrt3uaMQ+EXVDFdEzQl2GNRa9
-iKQTFdugJw9OR+Gutr3GO/c43Ezcpkudi3JaWoePfCZyqz8ErKY8NCQcN6TwfHFo
-jLWXsKhtRqfiHITZK7B66Kb4yfOnGbuPhtzo14V8VWzkQdYyHVPCLiMtqbI0dlt6
-bfTlAoGBAIfJ87AXnXMWlT9GgPUe6R2Mjln5VgW2X+VAW6P1ALBjpVoyfJg6/xn3
-7SHweBnQ1PopSHGGBIjWvw9KuScaaGg0+1vgcmtJiiZukNJ+YlHYOg1oWcb+EacT
-wAGeLZzRf+wKzpMT4cfCKVVxr5pTDXUmieI1VjxIVaZjxX+5RUE2
------END RSA PRIVATE KEY-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/keystore.jks b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/keystore.jks
new file mode 100644
index 000000000..6285f8e9e
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/keystore.jks
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/truststore.jks b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/truststore.jks
new file mode 100644
index 000000000..81872195d
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/truststore.jks
Binary files differ
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.crt b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.crt
new file mode 100644
index 000000000..0aaee0eec
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.crt
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDvjCCAqagAwIBAgIJAJJp49NkLrvBMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV
+BAYTAlBMMRQwEgYDVQQIDAtEb2xueSBTbGFzazEQMA4GA1UEBwwHV3JvY2xhdzEV
+MBMGA1UECgwMUm9vdCBDb21wYW55MRYwFAYDVQQLDA1JVCBEZXBhcnRtZW50MQ4w
+DAYDVQQDDAVOb2tpYTAeFw0xODEwMjYwOTE5NTFaFw0xOTEwMjYwOTE5NTFaMHQx
+CzAJBgNVBAYTAlBMMRQwEgYDVQQIDAtEb2xueSBTbGFzazEQMA4GA1UEBwwHV3Jv
+Y2xhdzEVMBMGA1UECgwMUm9vdCBDb21wYW55MRYwFAYDVQQLDA1JVCBEZXBhcnRt
+ZW50MQ4wDAYDVQQDDAVOb2tpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALvjq8cuNmfZe8S0ONp0LvSx1fgdWaARuGTcTgjLlV+8ng7f4eVodj8bn5BI
+cChjMjMc+8YfCLdZJxOl36/8pdIOe1pHGBgjJ5uPIFg0ESuVSN15azodw5ESGA2v
+Nhc4QlynLH/W5SsGRlkN0t9yRvGLb+uSrRqDtAFc448//qgTIsBYBl0cLoU4uMaj
+iSaxqEpBZPJSAOnof1XV4ZEXTE2lm/HHepa5RozlgYgCzF21m5k2inGN3p9NYdkN
+nq0ahl12j/GCuabwVblUnQPAUZzLtV9CtZkuPRdwnkLFGEMNVGsYWh+KAb2q7fr3
+9BNsqdWtIdX8CS30/KBMplSr/6UCAwEAAaNTMFEwHQYDVR0OBBYEFKTTrBaUlhXo
+kaD2n2CbtVT/+vV8MB8GA1UdIwQYMBaAFKTTrBaUlhXokaD2n2CbtVT/+vV8MA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ8VwmT28OF5+wKooFbJ
+oxhOp80dEaBHOuoBkIqiQFS3Bf3lhUcue+sqWWN2D/vSosQpIUImXPrnjAogGT8p
+HCnh0eblY89Q62wtGtdhDWPdrmZ198MOQifaIKTDLDE0viLGtCC+aBOATEjm/K2O
+e2lFxYVckZw7wEnbWoQCYxEE9qczxBjkStPhF3RqyorbxVQKfSKlo1bspTCwB3pW
+LpXcY6OP8ZL0v46HExy1d9pAsh0gcWDyG812/86AdYEeoaV7QJh2B9fRRAuFve9S
+GWEEtxPobvXfLL6QOFiacSwmyqckuMxgYGpAcJSVYoA1r9xNJA24SO68We9EaCty
+7WU=
+-----END CERTIFICATE-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.key b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.key
new file mode 100644
index 000000000..43af86505
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQC746vHLjZn2XvE
+tDjadC70sdX4HVmgEbhk3E4Iy5VfvJ4O3+HlaHY/G5+QSHAoYzIzHPvGHwi3WScT
+pd+v/KXSDntaRxgYIyebjyBYNBErlUjdeWs6HcOREhgNrzYXOEJcpyx/1uUrBkZZ
+DdLfckbxi2/rkq0ag7QBXOOPP/6oEyLAWAZdHC6FOLjGo4kmsahKQWTyUgDp6H9V
+1eGRF0xNpZvxx3qWuUaM5YGIAsxdtZuZNopxjd6fTWHZDZ6tGoZddo/xgrmm8FW5
+VJ0DwFGcy7VfQrWZLj0XcJ5CxRhDDVRrGFofigG9qu369/QTbKnVrSHV/Akt9Pyg
+TKZUq/+lAgMBAAECggEBALrgl9pkfHiOOCxNlL6zEIEQ4GEH0D0FYwHunS7iTpAK
+aqsgwu4KGJJsRyia4/NHtoZgLYvBEkpKwjMoqHPCNqvW+5mvXKelT5/Jm8IfB3Tx
+5qdiPORw9jM0a/gwbPxrWJYPMJN2ijlg5FdvCG52m1lj9s239bSJimBQo4W3gPJp
+YXCN+cO7DMpaIsvTpFnQUyiRxzbqmWD/dI51/GdsQUkjM5VRTXtv9D+RCaVE/Gyd
+cdzHOm6MuULEeuaWtoUKux6v94xoQDhf4p9AECDowzEeHmvJ6qEQzantnEUtJNsI
++47sP8IZE0qs9lCcrJHeK37aO1IS39VY2BeAR6XkR4ECgYEA48NfVTTmKN6sNDGa
+aVgkDalATdHPFhitKAvBPBR1R/eCz37gdGX19DNYShiXBny2XEkuyY8chuhUmBMV
+A5OrIMLoF0ByvsZXEaghhBirFsmXTjc3gAhFz6r6oSDM/dYs5pFYSR+gnnl/WALA
+8Y82FxdKA9d5gkeAGY5GvmO9L7sCgYEA0y7Ny9s3VvDr2oU89ujdGviUkiDxstis
+vajsg3BojJweid7WjL0Gv1/wtwiPtZkCZSnaKv6Q2zxSZ1OJpWvff5TbjG/WfzXu
+fkITnkFzF8klQswkge7uRryI0NJBFLzgl3sWGJwHNuNmRaw7i5Ie9OhXE0NzH9B+
+Aixx3TwKKB8CgYEAjOBTHwjRM4ZHTSFBONdjtW9ybq/PPwOUVqiupNKimBjnuB/q
+BRTrxFfdzDbZcxHAWeSKI/F425joegeTf9rehi0IERmz33webrVnxaTcbgPSqnZM
+xcxYIdLHotH++SJ4M0TDLrd5SYwsz+skHEVQV4f4J9gnOAWxnhz6dNiMM/ECgYEA
+pypkYxr62kpJGCfh0z0PULs2t9l2GXEkg9kEpyLCz5MBJXeMc8lpXvGt1OTlBQXC
+fJu9g80Qk0pTnFDnI1eZih8mDyu0KexiBfV+HAaI+WoSoaaAu42LddjloA7ez3CX
+g7E+E2rm1w74NOyaEegvswN7cdcxeRyLsmLGGy7ch1cCgYEAnbv8i9Mt0FzCqX5O
+yr1JehLoQWz4RqIibtEcjk7cQFjhUUx5UqnRHS6DAinL9vh92G/3JYsX/Ur2k2f9
+nl/y3clx5hjQubEt18lu8oi76dRRD3HBb6JA4rnZBvG3cpu9zy3Ik3hxMLdxGvfN
+ciDoTou+NnAuP0e3KTDyTe+1MMc=
+-----END PRIVATE KEY-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.pem b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.pem
new file mode 100644
index 000000000..96e5ed63a
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.pem
@@ -0,0 +1,50 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEAu+Orxy42Z9l7xLQ42nQu9LHV+B1ZoBG4ZNxOCMuVX7yeDt/h
+5Wh2PxufkEhwKGMyMxz7xh8It1knE6Xfr/yl0g57WkcYGCMnm48gWDQRK5VI3Xlr
+Oh3DkRIYDa82FzhCXKcsf9blKwZGWQ3S33JG8Ytv65KtGoO0AVzjjz/+qBMiwFgG
+XRwuhTi4xqOJJrGoSkFk8lIA6eh/VdXhkRdMTaWb8cd6lrlGjOWBiALMXbWbmTaK
+cY3en01h2Q2erRqGXXaP8YK5pvBVuVSdA8BRnMu1X0K1mS49F3CeQsUYQw1Uaxha
+H4oBvart+vf0E2yp1a0h1fwJLfT8oEymVKv/pQIDAQABAoIBAQC64JfaZHx4jjgs
+TZS+sxCBEOBhB9A9BWMB7p0u4k6QCmqrIMLuChiSbEcomuPzR7aGYC2LwRJKSsIz
+KKhzwjar1vuZr1ynpU+fyZvCHwd08eanYjzkcPYzNGv4MGz8a1iWDzCTdoo5YORX
+bwhudptZY/bNt/W0iYpgUKOFt4DyaWFwjfnDuwzKWiLL06RZ0FMokcc26plg/3SO
+dfxnbEFJIzOVUU17b/Q/kQmlRPxsnXHcxzpujLlCxHrmlraFCrser/eMaEA4X+Kf
+QBAg6MMxHh5ryeqhEM2p7ZxFLSTbCPuO7D/CGRNKrPZQnKyR3it+2jtSEt/VWNgX
+gEel5EeBAoGBAOPDX1U05ijerDQxmmlYJA2pQE3RzxYYrSgLwTwUdUf3gs9+4HRl
+9fQzWEoYlwZ8tlxJLsmPHIboVJgTFQOTqyDC6BdAcr7GVxGoIYQYqxbJl043N4AI
+Rc+q+qEgzP3WLOaRWEkfoJ55f1gCwPGPNhcXSgPXeYJHgBmORr5jvS+7AoGBANMu
+zcvbN1bw69qFPPbo3Rr4lJIg8bLYrL2o7INwaIycHone1oy9Br9f8LcIj7WZAmUp
+2ir+kNs8UmdTiaVr33+U24xv1n817n5CE55BcxfJJULMJIHu7ka8iNDSQRS84Jd7
+FhicBzbjZkWsO4uSHvToVxNDcx/QfgIscd08CigfAoGBAIzgUx8I0TOGR00hQTjX
+Y7Vvcm6vzz8DlFaorqTSopgY57gf6gUU68RX3cw22XMRwFnkiiPxeNuY6HoHk3/a
+3oYtCBEZs998Hm61Z8Wk3G4D0qp2TMXMWCHSx6LR/vkieDNEwy63eUmMLM/rJBxF
+UFeH+CfYJzgFsZ4c+nTYjDPxAoGBAKcqZGMa+tpKSRgn4dM9D1C7NrfZdhlxJIPZ
+BKciws+TASV3jHPJaV7xrdTk5QUFwnybvYPNEJNKU5xQ5yNXmYofJg8rtCnsYgX1
+fhwGiPlqEqGmgLuNi3XY5aAO3s9wl4OxPhNq5tcO+DTsmhHoL7MDe3HXMXkci7Ji
+xhsu3IdXAoGBAJ27/IvTLdBcwql+Tsq9SXoS6EFs+EaiIm7RHI5O3EBY4VFMeVKp
+0R0ugwIpy/b4fdhv9yWLF/1K9pNn/Z5f8t3JceYY0LmxLdfJbvKIu+nUUQ9xwW+i
+QOK52Qbxt3Kbvc8tyJN4cTC3cRr3zXIg6E6LvjZwLj9Htykw8k3vtTDH
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDvjCCAqagAwIBAgIJAJJp49NkLrvBMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV
+BAYTAlBMMRQwEgYDVQQIDAtEb2xueSBTbGFzazEQMA4GA1UEBwwHV3JvY2xhdzEV
+MBMGA1UECgwMUm9vdCBDb21wYW55MRYwFAYDVQQLDA1JVCBEZXBhcnRtZW50MQ4w
+DAYDVQQDDAVOb2tpYTAeFw0xODEwMjYwOTE5NTFaFw0xOTEwMjYwOTE5NTFaMHQx
+CzAJBgNVBAYTAlBMMRQwEgYDVQQIDAtEb2xueSBTbGFzazEQMA4GA1UEBwwHV3Jv
+Y2xhdzEVMBMGA1UECgwMUm9vdCBDb21wYW55MRYwFAYDVQQLDA1JVCBEZXBhcnRt
+ZW50MQ4wDAYDVQQDDAVOb2tpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALvjq8cuNmfZe8S0ONp0LvSx1fgdWaARuGTcTgjLlV+8ng7f4eVodj8bn5BI
+cChjMjMc+8YfCLdZJxOl36/8pdIOe1pHGBgjJ5uPIFg0ESuVSN15azodw5ESGA2v
+Nhc4QlynLH/W5SsGRlkN0t9yRvGLb+uSrRqDtAFc448//qgTIsBYBl0cLoU4uMaj
+iSaxqEpBZPJSAOnof1XV4ZEXTE2lm/HHepa5RozlgYgCzF21m5k2inGN3p9NYdkN
+nq0ahl12j/GCuabwVblUnQPAUZzLtV9CtZkuPRdwnkLFGEMNVGsYWh+KAb2q7fr3
+9BNsqdWtIdX8CS30/KBMplSr/6UCAwEAAaNTMFEwHQYDVR0OBBYEFKTTrBaUlhXo
+kaD2n2CbtVT/+vV8MB8GA1UdIwQYMBaAFKTTrBaUlhXokaD2n2CbtVT/+vV8MA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ8VwmT28OF5+wKooFbJ
+oxhOp80dEaBHOuoBkIqiQFS3Bf3lhUcue+sqWWN2D/vSosQpIUImXPrnjAogGT8p
+HCnh0eblY89Q62wtGtdhDWPdrmZ198MOQifaIKTDLDE0viLGtCC+aBOATEjm/K2O
+e2lFxYVckZw7wEnbWoQCYxEE9qczxBjkStPhF3RqyorbxVQKfSKlo1bspTCwB3pW
+LpXcY6OP8ZL0v46HExy1d9pAsh0gcWDyG812/86AdYEeoaV7QJh2B9fRRAuFve9S
+GWEEtxPobvXfLL6QOFiacSwmyqckuMxgYGpAcJSVYoA1r9xNJA24SO68We9EaCty
+7WU=
+-----END CERTIFICATE-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_crt.pem b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_crt.pem
new file mode 100644
index 000000000..0aaee0eec
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_crt.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDvjCCAqagAwIBAgIJAJJp49NkLrvBMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV
+BAYTAlBMMRQwEgYDVQQIDAtEb2xueSBTbGFzazEQMA4GA1UEBwwHV3JvY2xhdzEV
+MBMGA1UECgwMUm9vdCBDb21wYW55MRYwFAYDVQQLDA1JVCBEZXBhcnRtZW50MQ4w
+DAYDVQQDDAVOb2tpYTAeFw0xODEwMjYwOTE5NTFaFw0xOTEwMjYwOTE5NTFaMHQx
+CzAJBgNVBAYTAlBMMRQwEgYDVQQIDAtEb2xueSBTbGFzazEQMA4GA1UEBwwHV3Jv
+Y2xhdzEVMBMGA1UECgwMUm9vdCBDb21wYW55MRYwFAYDVQQLDA1JVCBEZXBhcnRt
+ZW50MQ4wDAYDVQQDDAVOb2tpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALvjq8cuNmfZe8S0ONp0LvSx1fgdWaARuGTcTgjLlV+8ng7f4eVodj8bn5BI
+cChjMjMc+8YfCLdZJxOl36/8pdIOe1pHGBgjJ5uPIFg0ESuVSN15azodw5ESGA2v
+Nhc4QlynLH/W5SsGRlkN0t9yRvGLb+uSrRqDtAFc448//qgTIsBYBl0cLoU4uMaj
+iSaxqEpBZPJSAOnof1XV4ZEXTE2lm/HHepa5RozlgYgCzF21m5k2inGN3p9NYdkN
+nq0ahl12j/GCuabwVblUnQPAUZzLtV9CtZkuPRdwnkLFGEMNVGsYWh+KAb2q7fr3
+9BNsqdWtIdX8CS30/KBMplSr/6UCAwEAAaNTMFEwHQYDVR0OBBYEFKTTrBaUlhXo
+kaD2n2CbtVT/+vV8MB8GA1UdIwQYMBaAFKTTrBaUlhXokaD2n2CbtVT/+vV8MA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ8VwmT28OF5+wKooFbJ
+oxhOp80dEaBHOuoBkIqiQFS3Bf3lhUcue+sqWWN2D/vSosQpIUImXPrnjAogGT8p
+HCnh0eblY89Q62wtGtdhDWPdrmZ198MOQifaIKTDLDE0viLGtCC+aBOATEjm/K2O
+e2lFxYVckZw7wEnbWoQCYxEE9qczxBjkStPhF3RqyorbxVQKfSKlo1bspTCwB3pW
+LpXcY6OP8ZL0v46HExy1d9pAsh0gcWDyG812/86AdYEeoaV7QJh2B9fRRAuFve9S
+GWEEtxPobvXfLL6QOFiacSwmyqckuMxgYGpAcJSVYoA1r9xNJA24SO68We9EaCty
+7WU=
+-----END CERTIFICATE-----
diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_key.pem b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_key.pem
new file mode 100644
index 000000000..2003df7c7
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEAu+Orxy42Z9l7xLQ42nQu9LHV+B1ZoBG4ZNxOCMuVX7yeDt/h
+5Wh2PxufkEhwKGMyMxz7xh8It1knE6Xfr/yl0g57WkcYGCMnm48gWDQRK5VI3Xlr
+Oh3DkRIYDa82FzhCXKcsf9blKwZGWQ3S33JG8Ytv65KtGoO0AVzjjz/+qBMiwFgG
+XRwuhTi4xqOJJrGoSkFk8lIA6eh/VdXhkRdMTaWb8cd6lrlGjOWBiALMXbWbmTaK
+cY3en01h2Q2erRqGXXaP8YK5pvBVuVSdA8BRnMu1X0K1mS49F3CeQsUYQw1Uaxha
+H4oBvart+vf0E2yp1a0h1fwJLfT8oEymVKv/pQIDAQABAoIBAQC64JfaZHx4jjgs
+TZS+sxCBEOBhB9A9BWMB7p0u4k6QCmqrIMLuChiSbEcomuPzR7aGYC2LwRJKSsIz
+KKhzwjar1vuZr1ynpU+fyZvCHwd08eanYjzkcPYzNGv4MGz8a1iWDzCTdoo5YORX
+bwhudptZY/bNt/W0iYpgUKOFt4DyaWFwjfnDuwzKWiLL06RZ0FMokcc26plg/3SO
+dfxnbEFJIzOVUU17b/Q/kQmlRPxsnXHcxzpujLlCxHrmlraFCrser/eMaEA4X+Kf
+QBAg6MMxHh5ryeqhEM2p7ZxFLSTbCPuO7D/CGRNKrPZQnKyR3it+2jtSEt/VWNgX
+gEel5EeBAoGBAOPDX1U05ijerDQxmmlYJA2pQE3RzxYYrSgLwTwUdUf3gs9+4HRl
+9fQzWEoYlwZ8tlxJLsmPHIboVJgTFQOTqyDC6BdAcr7GVxGoIYQYqxbJl043N4AI
+Rc+q+qEgzP3WLOaRWEkfoJ55f1gCwPGPNhcXSgPXeYJHgBmORr5jvS+7AoGBANMu
+zcvbN1bw69qFPPbo3Rr4lJIg8bLYrL2o7INwaIycHone1oy9Br9f8LcIj7WZAmUp
+2ir+kNs8UmdTiaVr33+U24xv1n817n5CE55BcxfJJULMJIHu7ka8iNDSQRS84Jd7
+FhicBzbjZkWsO4uSHvToVxNDcx/QfgIscd08CigfAoGBAIzgUx8I0TOGR00hQTjX
+Y7Vvcm6vzz8DlFaorqTSopgY57gf6gUU68RX3cw22XMRwFnkiiPxeNuY6HoHk3/a
+3oYtCBEZs998Hm61Z8Wk3G4D0qp2TMXMWCHSx6LR/vkieDNEwy63eUmMLM/rJBxF
+UFeH+CfYJzgFsZ4c+nTYjDPxAoGBAKcqZGMa+tpKSRgn4dM9D1C7NrfZdhlxJIPZ
+BKciws+TASV3jHPJaV7xrdTk5QUFwnybvYPNEJNKU5xQ5yNXmYofJg8rtCnsYgX1
+fhwGiPlqEqGmgLuNi3XY5aAO3s9wl4OxPhNq5tcO+DTsmhHoL7MDe3HXMXkci7Ji
+xhsu3IdXAoGBAJ27/IvTLdBcwql+Tsq9SXoS6EFs+EaiIm7RHI5O3EBY4VFMeVKp
+0R0ugwIpy/b4fdhv9yWLF/1K9pNn/Z5f8t3JceYY0LmxLdfJbvKIu+nUUQ9xwW+i
+QOK52Qbxt3Kbvc8tyJN4cTC3cRr3zXIg6E6LvjZwLj9Htykw8k3vtTDH
+-----END RSA PRIVATE KEY-----
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