diff options
author | Arne Schwabe <arne@rfc2549.org> | 2013-11-23 14:08:51 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2013-11-23 14:08:51 +0100 |
commit | d6e51630dcae4b9982a84fcd68b92b5c709d4c52 (patch) | |
tree | 7214d5d347e8dd2cea6ab69bf6c45e775e7c3b94 /openvpn/src/openvpn/ssl.c | |
parent | c1571bb90a4449cf3d359392b6093079ab705721 (diff) |
Update OpenVPN source code (closes issue #209)
--HG--
extra : rebase_source : 26d053a6a25472491471f00c12f93965f20e6068
Diffstat (limited to 'openvpn/src/openvpn/ssl.c')
-rw-r--r-- | openvpn/src/openvpn/ssl.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/openvpn/src/openvpn/ssl.c b/openvpn/src/openvpn/ssl.c index 4203fc5c..bd19d754 100644 --- a/openvpn/src/openvpn/ssl.c +++ b/openvpn/src/openvpn/ssl.c @@ -509,12 +509,8 @@ init_ssl (const struct options *options, struct tls_root_ctx *new_ctx) #ifdef MANAGMENT_EXTERNAL_KEY else if ((options->management_flags & MF_EXTERNAL_KEY) && options->cert_file) { - openvpn_x509_cert_t *my_cert = NULL; - tls_ctx_load_cert_file(new_ctx, options->cert_file, options->cert_file_inline, - &my_cert); - tls_ctx_use_external_private_key(new_ctx, my_cert); - - tls_ctx_free_cert_file(my_cert); + tls_ctx_use_external_private_key(new_ctx, options->cert_file, + options->cert_file_inline); } #endif else @@ -522,7 +518,7 @@ init_ssl (const struct options *options, struct tls_root_ctx *new_ctx) /* Load Certificate */ if (options->cert_file) { - tls_ctx_load_cert_file(new_ctx, options->cert_file, options->cert_file_inline, NULL); + tls_ctx_load_cert_file(new_ctx, options->cert_file, options->cert_file_inline); } /* Load Private Key */ |