126 lines
4.4 KiB
Diff
126 lines
4.4 KiB
Diff
Source: https://svnweb.freebsd.org/ports/head/mail/postfix/files/?sortby=date#dirlist
|
|
Upstream: no, upstream does not define a contribution workflow/platform
|
|
Reason: fix compatibility with LibreSSL
|
|
|
|
--- src/posttls-finger/posttls-finger.c 2017-02-03 23:43:04.000000000 +0100
|
|
+++ src/posttls-finger/posttls-finger.c 2018-11-29 11:20:05.850958411 +0100
|
|
@@ -1513,7 +1513,8 @@
|
|
return (0);
|
|
}
|
|
|
|
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if defined(USE_TLS) && \
|
|
+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
|
|
|
|
/* ssl_cleanup - free memory allocated in the OpenSSL library */
|
|
|
|
@@ -1966,7 +1967,8 @@
|
|
cleanup(&state);
|
|
|
|
/* OpenSSL 1.1.0 and later (de)initialization is implicit */
|
|
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if defined(USE_TLS) && \
|
|
+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
|
|
ssl_cleanup();
|
|
#endif
|
|
|
|
--- src/tls/tls_client.c 2018-11-17 23:33:15.000000000 +0100
|
|
+++ src/tls/tls_client.c 2018-11-29 11:20:44.305963154 +0100
|
|
@@ -299,7 +299,7 @@
|
|
*/
|
|
tls_check_version();
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
|
|
/*
|
|
* Initialize the OpenSSL library by the book! To start with, we must
|
|
@@ -433,7 +433,7 @@
|
|
/*
|
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
|
*/
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
|
|
/*
|
|
* According to the OpenSSL documentation, temporary RSA key is needed
|
|
--- src/tls/tls_dane.c 2018-11-05 00:47:50.000000000 +0100
|
|
+++ src/tls/tls_dane.c 2018-11-29 11:21:12.762966395 +0100
|
|
@@ -2127,7 +2127,7 @@
|
|
tls_param_init();
|
|
tls_check_version();
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
SSL_load_error_strings();
|
|
SSL_library_init();
|
|
#endif
|
|
--- src/tls/tls.h 2018-11-17 23:55:55.000000000 +0100
|
|
+++ src/tls/tls.h 2018-11-29 11:21:38.228969112 +0100
|
|
@@ -89,7 +89,7 @@
|
|
#endif
|
|
|
|
/* Backwards compatibility with OpenSSL < 1.1.0 */
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#define OpenSSL_version_num SSLeay
|
|
#define OpenSSL_version SSLeay_version
|
|
#define OPENSSL_VERSION SSLEAY_VERSION
|
|
--- src/tls/tls_rsa.c 2016-01-03 15:49:51.000000000 +0100
|
|
+++ src/tls/tls_rsa.c 2018-11-29 11:22:05.178971819 +0100
|
|
@@ -57,7 +57,7 @@
|
|
/*
|
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
|
*/
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
|
|
/* tls_tmp_rsa_cb - call-back to generate ephemeral RSA key */
|
|
|
|
@@ -109,7 +109,7 @@
|
|
/*
|
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
|
*/
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
RSA *rsa;
|
|
|
|
msg_vstream_init(argv[0], VSTREAM_ERR);
|
|
--- src/tls/tls_server.c 2018-11-17 23:33:15.000000000 +0100
|
|
+++ src/tls/tls_server.c 2018-11-29 11:24:36.505984117 +0100
|
|
@@ -174,7 +174,7 @@
|
|
#endif /* OPENSSL_VERSION_NUMBER */
|
|
|
|
/* OpenSSL 1.1.0 bitrot */
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
typedef const unsigned char *session_id_t;
|
|
|
|
#else
|
|
@@ -377,7 +377,7 @@
|
|
*/
|
|
tls_check_version();
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
|
|
/*
|
|
* Initialize the OpenSSL library by the book! To start with, we must
|
|
@@ -486,7 +486,7 @@
|
|
* OpenSSL 0.9.8h, while SSL_NO_TICKET was added in 0.9.8f.
|
|
*/
|
|
#ifdef SSL_OP_NO_TICKET
|
|
-#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL
|
|
+#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL && !defined(LIBRESSL_VERSION_NUMBER)
|
|
ticketable = (*var_tls_tkt_cipher && scache_timeout > 0
|
|
&& !(off & SSL_OP_NO_TICKET));
|
|
if (ticketable) {
|
|
@@ -595,7 +595,7 @@
|
|
/*
|
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
|
*/
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
|
|
/*
|
|
* According to OpenSSL documentation, a temporary RSA key is needed when
|