From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: FIXME <unknown@unknown>
Subject: [PATCH] Add LibreSSL support
Date: Mon,  8 Aug 2022 16:50:47 +0200

Origin: OpenBSD
[ismael@iodev.co.uk: Updated for stunnel 5.82]
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
 src/ctx.c      | 4 ++--
 src/sthreads.c | 5 +++--
 src/verify.c   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

--- a/src/ctx.c
+++ b/src/ctx.c
@@ -149,7 +149,7 @@
 NOEXPORT SSL_SESSION *SSL_SESSION_dup(SSL_SESSION *src);
 #endif
 NOEXPORT SSL_SESSION *sess_get_cb(SSL *ssl,
-#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER>=0x10100000L
     const
 #endif
     unsigned char *key, int key_len, int *do_copy);
@@ -2145,7 +2145,7 @@
 #endif
 
 NOEXPORT SSL_SESSION *sess_get_cb(SSL *ssl,
-#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER>=0x10100000L
         const
 #endif
         unsigned char *key, int key_len, int *do_copy) {
--- a/src/sthreads.c
+++ b/src/sthreads.c
@@ -407,7 +407,7 @@
 #endif
 }
 
-#if OPENSSL_VERSION_NUMBER<0x10100004L
+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
 
 #ifdef USE_OS_THREADS
 
@@ -472,7 +472,8 @@
 
 NOEXPORT void locking_init(void) {
     size_t i;
-#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L
+#if defined(USE_OS_THREADS) && \
+	(OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER))
     size_t num;
 
     /* initialize the OpenSSL static locking */
--- a/src/verify.c
+++ b/src/verify.c
@@ -442,7 +442,7 @@
     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
     subject=X509_get_subject_name(cert);
 
-#if OPENSSL_VERSION_NUMBER<0x10100006L
+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
 #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
 #endif
     /* modern API allows retrieving multiple matching certificates */

.