[patch] Patch for stunnel >5.50-r1

stunnel-libressl.patch (text/plain), 1.79 KB, created by Tezeta on 2019-04-15 19:13:27 UTC

--- a/src/ctx.c	2019-04-15 13:57:35.767522787 -0400
+++ b/src/ctx.c	2019-04-15 13:59:22.034253732 -0400
@@ -91,7 +91,7 @@
 NOEXPORT int ui_retry();
 
 /* session tickets */
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
 NOEXPORT int generate_session_ticket_cb(SSL *, void *);
 NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
     const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
@@ -176,7 +176,7 @@
         }
     }

-#ifndef OPENSSL_NO_TLS1_3
+#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2090000fL) && !defined(OPENSSL_NO_TLS1_3)
     /* ciphersuites */
     if(section->ciphersuites) {
         s_log(LOG_DEBUG, "TLSv1.3 ciphersuites: %s", section->ciphersuites);
@@ -229,7 +230,7 @@
 #endif
 
     /* setup session tickets */
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
     SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
         decrypt_session_ticket_cb, NULL);
 #endif /* OpenSSL 1.1.1 or later */
@@ -969,7 +970,7 @@
 
 /**************************************** session tickets */
 
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
 
 typedef struct {
     void *session_authenticated;

--- a/src/client.c	2019-04-15 13:57:56.010868367 -0400
+++ b/src/client.c	2019-04-15 13:58:05.444207404 -0400
@@ -680,7 +680,7 @@
         }
 
         /****************************** wait for an event */
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
         pending=SSL_pending(c->ssl) || SSL_has_pending(c->ssl);
 #else
         pending=SSL_pending(c->ssl);