From 3b482a5cd9f69abd47605fb4666a22f07e57098c Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Sat, 4 Feb 2017 07:55:29 +0000 Subject: - update to 20170129 - fix build with libressl < 2.5.x Release Notes: ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.2-20170129.RELEASE_NOTES PR: 216732 Submitted by: Bernard Spil Reported by: Piotr Kubaj Obtained from: OpenBSD --- mail/postfix-current/files/patch-src_tls_tls__dh.c | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 mail/postfix-current/files/patch-src_tls_tls__dh.c (limited to 'mail/postfix-current/files') diff --git a/mail/postfix-current/files/patch-src_tls_tls__dh.c b/mail/postfix-current/files/patch-src_tls_tls__dh.c new file mode 100644 index 000000000000..2575ead80c6b --- /dev/null +++ b/mail/postfix-current/files/patch-src_tls_tls__dh.c @@ -0,0 +1,48 @@ +PR 216732: Fix build with libressl < 2.5.1 +========================================================= +--- src/tls/tls_dh.c.orig 2016-12-26 23:47:24 UTC ++++ src/tls/tls_dh.c +@@ -94,7 +94,7 @@ + #define TLS_INTERNAL + #include + #include +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER) + #include + #endif + +@@ -244,7 +244,7 @@ DH *tls_tmp_dh_cb(SSL *unused_ssl, i + + void tls_auto_eecdh_curves(SSL_CTX *ctx) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX *tmpctx; + int *nids; + int space = 5; +@@ -337,14 +337,14 @@ void tls_set_eecdh_curve(SSL_CTX *ser + #define TLS_EECDH_NONE 1 + #define TLS_EECDH_STRONG 2 + #define TLS_EECDH_ULTRA 3 +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(LIBRESSL_VERSION_NUMBER) + #define TLS_EECDH_AUTO 4 + #endif + static NAME_CODE eecdh_table[] = { + "none", TLS_EECDH_NONE, + "strong", TLS_EECDH_STRONG, + "ultra", TLS_EECDH_ULTRA, +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(LIBRESSL_VERSION_NUMBER) + "auto", TLS_EECDH_AUTO, + #endif + 0, TLS_EECDH_INVALID, +@@ -364,7 +364,7 @@ void tls_set_eecdh_curve(SSL_CTX *ser + case TLS_EECDH_ULTRA: + curve = var_tls_eecdh_ultra; + break; +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(LIBRESSL_VERSION_NUMBER) + case TLS_EECDH_AUTO: + tls_auto_eecdh_curves(server_ctx); + return; -- cgit v1.2.3