From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 23 Nov 2013 12:40:34 +0000 (+0100)
Subject: Fix compile error in ssl_openssl introduced by polar external-management patch
X-Git-Tag: v2.3.3~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=816ccf2666a2de6b7098c4b28d931ea378c278ea;p=thirdparty%2Fopenvpn.git

Fix compile error in ssl_openssl introduced by polar external-management patch

Acked-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1385210434-28364-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8039

Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 20fe5561dfe7a6f1da3aac07b38d0773c2758e5e)
---

diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index 6f6f24dab..0193acf3e 100644
--- a/src/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -535,7 +535,7 @@ void
 tls_ctx_load_cert_file (struct tls_root_ctx *ctx, const char *cert_file,
     const char *cert_file_inline)
 {
-  tls_ctx_load_cert_file_ext(ctx, cert_file, cert_file_inline, NULL);
+  tls_ctx_load_cert_file_and_copy (ctx, cert_file, cert_file_inline, NULL);
 }
 
 void
@@ -686,7 +686,7 @@ tls_ctx_use_external_private_key (struct tls_root_ctx *ctx,
   ASSERT (NULL != ctx);
   ASSERT (NULL != cert);
 
-  tls_ctx_load_cert_file_ext(ctx, cert_file, cert_file_inline, &cert);
+  tls_ctx_load_cert_file_and_copy (ctx, cert_file, cert_file_inline, &cert);
 
   /* allocate custom RSA method object */
   ALLOC_OBJ_CLEAR (rsa_meth, RSA_METHOD);