1. openvpn
  2. Commit 68793f40e1d04409264d21dd24453d959828a306
Browse code

Move ASSERT so external-key with OpenSSL works again

Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1385728360-32127-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8069

Signed-off-by: Gert Doering <gert@greenie.muc.de>

Arne Schwabe authored on 2013/11/29 21:32:40
Showing 1 changed files
src/openvpn/ssl_openssl.c
History View file @ 68793f4
... ... 
@@ -682,10 +682,11 @@ tls_ctx_use_external_private_key (struct tls_root_ctx *ctx,
682 682 
   X509 *cert = NULL;
683 683
684 684 
   ASSERT (NULL != ctx);
685 
-  ASSERT (NULL != cert);
686 685
687 686 
   tls_ctx_load_cert_file_and_copy (ctx, cert_file, cert_file_inline, &cert);
688 687
688 
+  ASSERT (NULL != cert);
689 
+
689 690 
   /* allocate custom RSA method object */
690 691 
   ALLOC_OBJ_CLEAR (rsa_meth, RSA_METHOD);
691 692 
   rsa_meth->name = "OpenVPN external private key RSA Method";