From 5f3d28b374d4058a08753d06c675cbc589675e24 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 29 Nov 2013 13:32:40 +0100 Subject: [PATCH] Move ASSERT so external-key with OpenSSL works again Acked-by: Steffan Karger Message-Id: <1385728360-32127-1-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8069 trac #693 Signed-off-by: Gert Doering (cherry picked from commit 68793f40e1d04409264d21dd24453d959828a306) --- src/openvpn/ssl_openssl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 1dfbb23e2..a226aac6d 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -780,10 +780,11 @@ tls_ctx_use_external_private_key (struct tls_root_ctx *ctx, X509 *cert = NULL; ASSERT (NULL != ctx); - ASSERT (NULL != cert); tls_ctx_load_cert_file_and_copy (ctx, cert_file, cert_file_inline, &cert); + ASSERT (NULL != cert); + /* allocate custom RSA method object */ ALLOC_OBJ_CLEAR (rsa_meth, RSA_METHOD); rsa_meth->name = "OpenVPN external private key RSA Method"; -- 2.47.2