diff options
Diffstat (limited to 'mail/postfix-current/files')
7 files changed, 11 insertions, 150 deletions
diff --git a/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c b/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c deleted file mode 100644 index 10f2e2d22d87..000000000000 --- a/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/posttls-finger/posttls-finger.c.orig 2016-08-27 20:27:50 UTC -+++ src/posttls-finger/posttls-finger.c -@@ -1511,7 +1511,8 @@ static int finger(STATE *state) - 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 */ - -@@ -1958,7 +1959,8 @@ int main(int argc, char *argv[]) - 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 - diff --git a/mail/postfix-current/files/patch-src_tls_tls.h b/mail/postfix-current/files/patch-src_tls_tls.h deleted file mode 100644 index 56bbb585f6e3..000000000000 --- a/mail/postfix-current/files/patch-src_tls_tls.h +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_tls_tls_h,v 1.2 2017/03/04 22:09:43 sthen Exp $ - -Fix building with LibreSSL - ---- src/tls/tls.h.orig 2017-01-01 22:22:13 UTC -+++ src/tls/tls.h -@@ -89,7 +89,7 @@ extern const char *str_tls_level(int); - #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 -@@ -104,6 +104,9 @@ extern const char *str_tls_level(int); - #define ASN1_STRING_get0_data ASN1_STRING_data - #define X509_getm_notBefore X509_get_notBefore - #define X509_getm_notAfter X509_get_notAfter -+#endif -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #define TLS_method SSLv23_method - #define TLS_client_method SSLv23_client_method - #define TLS_server_method SSLv23_server_method diff --git a/mail/postfix-current/files/patch-src_tls_tls__client.c b/mail/postfix-current/files/patch-src_tls_tls__client.c deleted file mode 100644 index 4f63c0858b26..000000000000 --- a/mail/postfix-current/files/patch-src_tls_tls__client.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/tls/tls_client.c.orig 2016-08-27 20:27:50 UTC -+++ src/tls/tls_client.c -@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL - */ - 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 -@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TL - /* - * 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 diff --git a/mail/postfix-current/files/patch-src_tls_tls__dane.c b/mail/postfix-current/files/patch-src_tls_tls__dane.c deleted file mode 100644 index 494c3598053d..000000000000 --- a/mail/postfix-current/files/patch-src_tls_tls__dane.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tls/tls_dane.c.orig 2016-08-27 20:27:50 UTC -+++ src/tls/tls_dane.c -@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf - 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 diff --git a/mail/postfix-current/files/patch-src_tls_tls__dh.c b/mail/postfix-current/files/patch-src_tls_tls__dh.c deleted file mode 100644 index 686798d405eb..000000000000 --- a/mail/postfix-current/files/patch-src_tls_tls__dh.c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_tls_tls_dh_c,v 1.1 2017/03/04 22:09:43 sthen Exp $ - -Fix building with LibreSSL - ---- src/tls/tls_dh.c.orig 2016-12-26 23:47:24 UTC -+++ src/tls/tls_dh.c -@@ -314,7 +314,7 @@ void tls_auto_eecdh_curves(SSL_CTX *c - * This is a NOP in OpenSSL 1.1.0 and later, where curves are always - * auto-negotiated. - */ --#if OPENSSL_VERSION_NUMBER < 0x10100000UL -+#if OPENSSL_VERSION_NUMBER < 0x10100000UL || defined(LIBRESSL_VERSION_NUMBER) - if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) { - msg_warn("failed to enable automatic ECDHE curve selection"); - tls_print_errors(); diff --git a/mail/postfix-current/files/patch-src_tls_tls__rsa.c b/mail/postfix-current/files/patch-src_tls_tls__rsa.c deleted file mode 100644 index bbfd96134479..000000000000 --- a/mail/postfix-current/files/patch-src_tls_tls__rsa.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/tls/tls_rsa.c.orig 2016-01-03 14:49:51 UTC -+++ src/tls/tls_rsa.c -@@ -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 @@ int main(int unused_argc, char *cons - /* - * 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); diff --git a/mail/postfix-current/files/patch-src_tls_tls__server.c b/mail/postfix-current/files/patch-src_tls_tls__server.c index 30e5132e3e56..52ee2db78b95 100644 --- a/mail/postfix-current/files/patch-src_tls_tls__server.c +++ b/mail/postfix-current/files/patch-src_tls_tls__server.c @@ -1,38 +1,12 @@ ---- src/tls/tls_server.c.orig 2018-11-17 14:59:22 UTC +--- src/tls/tls_server.c.orig 2018-12-26 19:21:49 UTC +++ src/tls/tls_server.c -@@ -174,7 +174,7 @@ static const char server_session_id_cont - #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_APPL_STATE *tls_server_init(const TL - */ - 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 @@ TLS_APPL_STATE *tls_server_init(const TL - * 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 @@ TLS_APPL_STATE *tls_server_init(const TL - /* - * 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 +@@ -518,7 +518,9 @@ TLS_APPL_STATE *tls_server_init(const TL + * ticket decryption callback already (since 2.11) asks OpenSSL to + * avoid issuing new tickets when the presented ticket is re-usable. + */ ++#ifndef LIBRESSL_VERSION_NUMBER + SSL_CTX_set_num_tickets(server_ctx, 1); ++#endif + } + #endif + if (!ticketable) |