From: Adriaan de Jong <dejong@fox-it.com>
Date: Tue, 5 Jul 2011 10:02:12 +0000 (+0200)
Subject: Added an extra define to allow building without PKCS#11
X-Git-Tag: v2.3-alpha1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9bf901c76aca35cb40845177ef639225b6dabd5;p=thirdparty%2Fopenvpn.git

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>
---

diff --git a/ssl_polarssl.c b/ssl_polarssl.c
index 128e75d05..e6a966aa4 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 */