security/openvpn: regression fix, support LibreSSL again.

(I use a different patch than what was submitted by pizzamig@,
and have sent our patch upstream.)

Remove IGNORE_SSL.

While here, remove USE_LDCONFIG to fix a portlint complaint,
and fix a typo in a Makefile comment.

PR:		238382
Reported by:	pizzamig@

1 files changed, 66 insertions, 0 deletions

diff --git a/security/openvpn/files/patch-libressl b/security/openvpn/files/patch-libressl
new file mode 100644
index 000000000000..d8f9e35cbcdb
--- /dev/null
+++ b/security/openvpn/files/patch-libressl
@@ -0,0 +1,66 @@
+commit 5bc848a02665f26e83e5dbe8f4ef95f55e5e19bd
+Author: Matthias Andree <matthias.andree@gmx.de>
+Date:   Mon Aug 12 23:37:52 2019 +0200
+
+    Fix regression, reinstate LibreSSL support.
+    
+    OpenVPN 2.4.6 could be compiled with LibreSSL, 2.4.7 cannot.  This was broken
+    since 9de7fe0a "Add support for tls-ciphersuites for TLS 1.3".
+    
+    This patch avoids using TLS 1.3 directly, be it that OpenSSL was compiled
+    without TLS 1.3 support, or LibreSSL was used.
+    
+    This patch was based on an OpenBSD patch by
+    Jeremie Courreges-Anglas <jca@openbsd.org>, see
+    https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/openvpn/patches/patch-src_openvpn_ssl_openssl_c
+    but was revised to be more obvious and check actual feature macros,
+    do not rely on current LibreSSL implementation details alone.
+    
+    Franco Fichtner reports that OPNsense has been a long-time user
+    of LibreSSL without reported breakage, see also:
+    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238382#c10
+    
+    Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
+
+diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
+index a78dae99..293bb192 100644
+--- ./src/openvpn/ssl_openssl.c
++++ ./src/openvpn/ssl_openssl.c
+@@ -206,7 +206,7 @@ info_callback(INFO_CALLBACK_SSL_CONST SSL *s, int where, int ret)
+ int
+ tls_version_max(void)
+ {
+-#if defined(TLS1_3_VERSION)
++#if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3)
+     return TLS_VER_1_3;
+ #elif defined(TLS1_2_VERSION) || defined(SSL_OP_NO_TLSv1_2)
+     return TLS_VER_1_2;
+@@ -233,7 +233,7 @@ openssl_tls_version(int ver)
+     {
+         return TLS1_2_VERSION;
+     }
+-#if defined(TLS1_3_VERSION)
++#if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3)
+     else if (ver == TLS_VER_1_3)
+     {
+         return TLS1_3_VERSION;
+@@ -459,8 +459,8 @@ tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers)
+         return;
+     }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x1010100fL)
+-        crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher. "
++#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) || !defined(TLS1_3_VERSION) || defined(OPENSSL_NO_TLS1_3)
++        crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher, or without TLS 1.3 support. "
+                        "Ignoring TLS 1.3 only tls-ciphersuites '%s' setting.",
+                         ciphers);
+ #else
+@@ -1846,7 +1846,7 @@ show_available_tls_ciphers_list(const char *cipher_list,
+         crypto_msg(M_FATAL, "Cannot create SSL_CTX object");
+     }
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) && defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3)
+     if (tls13)
+     {
+         SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION);