Brought up-to-date with Alon's PKCS11 patch at

https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn@645
Pre-2.1_beta5


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@648 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 1 insertions, 10 deletions

diff --git a/ssl.c b/ssl.c
index 05bd85f..dc2381e 100644
--- a/ssl.c
+++ b/ssl.c
@@ -854,17 +854,8 @@ init_ssl (const struct options *options)
 #ifdef ENABLE_PKCS11
       if (options->pkcs11_providers[0])
        {
-	char password[256];
-	password[0] = '\0';
-	if (
-		!options->pkcs11_protected_authentication &&
-		options->key_pass_file
-	) {
-	  pem_password_callback (password, sizeof(password) - 1, 0, NULL);
-	}
-
         /* Load Certificate and Private Key */
-	if (!SSL_CTX_use_pkcs11 (ctx, options->pkcs11_slot_type, options->pkcs11_slot, options->pkcs11_id_type, options->pkcs11_id, password, options->pkcs11_protected_authentication))
+	if (!SSL_CTX_use_pkcs11 (ctx, options->pkcs11_slot_type, options->pkcs11_slot, options->pkcs11_id_type, options->pkcs11_id, options->pkcs11_protected_authentication))
 	  msg (M_SSLERR, "Cannot load certificate \"%s:%s\" from slot \"%s:%s\" using PKCS#11 interface",
                options->pkcs11_id_type, options->pkcs11_id, options->pkcs11_slot_type, options->pkcs11_slot);
        }