40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 9dfc2309c6b4143892137844197f5f84755f6580 Mon Sep 17 00:00:00 2001
|
|
From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
|
|
Date: Sun, 10 Jan 2016 14:44:35 +0100
|
|
Subject: [PATCH] Fix build with libressl
|
|
|
|
Signed-off-by: Niels Ole Salscheider <niels_ole@salscheider-online.de>
|
|
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
|
|
Message-Id: <1452433475-16779-1-git-send-email-niels_ole@salscheider-online.de>
|
|
URL: http://article.gmane.org/gmane.network.openvpn.devel/10975
|
|
Signed-off-by: Gert Doering <gert@greenie.muc.de>
|
|
---
|
|
src/openvpn/ssl_openssl.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git src/openvpn/ssl_openssl.c src/openvpn/ssl_openssl.c
|
|
index d2f40e7..e390f4d 100644
|
|
--- src/openvpn/ssl_openssl.c
|
|
+++ src/openvpn/ssl_openssl.c
|
|
@@ -358,7 +358,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx)
|
|
|
|
ASSERT (ctx);
|
|
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
/* OpenSSL 1.0.2 and up */
|
|
cert = SSL_CTX_get0_certificate (ctx->ctx);
|
|
#else
|
|
@@ -393,7 +393,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx)
|
|
}
|
|
|
|
cleanup:
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
SSL_free (ssl);
|
|
#endif
|
|
return;
|
|
--
|
|
2.7.0
|
|
|