summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriaan de Jong <dejong@fox-it.com>2011-07-05 12:02:12 +0200
committerDavid Sommerseth <davids@redhat.com>2011-10-22 16:00:49 +0200
commita9bf901c76aca35cb40845177ef639225b6dabd5 (patch)
tree9ae34126a695494272d2eef9622edeb63f26e70c
parent8bb72fbcba4721a68333f06d8b38a5ad05f6638a (diff)
downloadopenvpn-a9bf901c76aca35cb40845177ef639225b6dabd5.tar.gz
openvpn-a9bf901c76aca35cb40845177ef639225b6dabd5.tar.xz
openvpn-a9bf901c76aca35cb40845177ef639225b6dabd5.zip
Added an extra define to allow building without PKCS#11
Signed-off-by: Adriaan de Jong <dejong@fox-it.com> Acked-by: James Yonan <james@openvpn.net> Signed-off-by: David Sommerseth <davids@redhat.com>
-rw-r--r--ssl_polarssl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl_polarssl.c b/ssl_polarssl.c
index 128e75d..e6a966a 100644
--- a/ssl_polarssl.c
+++ b/ssl_polarssl.c
@@ -515,10 +515,12 @@ void key_state_ssl_init(struct key_state_ssl *ks_ssl,
/* Initialise authentication information */
if (is_server)
ssl_set_dh_param_ctx (ks_ssl->ctx, ssl_ctx->dhm_ctx );
+#if defined(ENABLE_PKCS11)
if (ssl_ctx->priv_key_pkcs11 != NULL)
ssl_set_own_cert_pkcs11( ks_ssl->ctx, ssl_ctx->crt_chain,
ssl_ctx->priv_key_pkcs11 );
else
+#endif
ssl_set_own_cert( ks_ssl->ctx, ssl_ctx->crt_chain, ssl_ctx->priv_key );
/* Initialise SSL verification */