diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-05-12 20:31:43 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-05-12 20:31:43 +0000 |
| commit | 1bda73a7b0f45a2502ae93e33e30b98152d893f3 (patch) | |
| tree | 7bdf8f59ec2c6443a071a0217f78f8a999596030 /ssl.c | |
| parent | 9ca8f3cf77b7d5ec5956777c2f2e8807bdbcca24 (diff) | |
| download | openvpn-1bda73a7b0f45a2502ae93e33e30b98152d893f3.tar.gz openvpn-1bda73a7b0f45a2502ae93e33e30b98152d893f3.tar.xz openvpn-1bda73a7b0f45a2502ae93e33e30b98152d893f3.zip | |
Moved branch into official BETA21 position.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2959 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'ssl.c')
| -rw-r--r-- | ssl.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -30,16 +30,10 @@ * over the same TCP/UDP port. */ -#ifdef WIN32 -#include "config-win32.h" -#else -#include "config.h" -#endif +#include "syshead.h" #if defined(USE_CRYPTO) && defined(USE_SSL) -#include "syshead.h" - #include "ssl.h" #include "error.h" #include "common.h" @@ -1210,7 +1204,7 @@ init_ssl (const struct options *options) if (options->pkcs11_providers[0]) { /* Load Certificate and Private Key */ - if (!SSL_CTX_use_pkcs11 (ctx, options->pkcs11_id)) + if (!SSL_CTX_use_pkcs11 (ctx, options->pkcs11_id_management, options->pkcs11_id)) { msg (M_WARN, "Cannot load certificate \"%s\" using PKCS#11 interface", options->pkcs11_id); goto err; |