]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Added an extra define to allow building without PKCS#11
authorAdriaan de Jong <dejong@fox-it.com>
Tue, 5 Jul 2011 10:02:12 +0000 (12:02 +0200)
committerDavid Sommerseth <davids@redhat.com>
Sat, 22 Oct 2011 14:00:49 +0000 (16:00 +0200)
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>
ssl_polarssl.c

index 128e75d052504dcb26b1c12b09bb4ca7a13da711..e6a966aa45dd4bc550784719df2640c80813a6d4 100644 (file)
@@ -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 */