diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-08-30 06:07:10 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-08-30 06:07:10 +0000 |
| commit | 2afe7aa63d3cb63cfbcdc1d35417c54485367906 (patch) | |
| tree | c08830a38c5628801299e693ab7d2cabbc70d4cb /mail/postfix-current/files/patch-src_tls_tls__server.c | |
| parent | math/R-cran-gss: updated to version 2.1-6 (diff) | |
mail/postfix-current: Fix runtime TLS failure with LibreSSL
- Add LibreSSL checks to <> 1.1.0 OpenSSL checks
- Bump portrevision
PR: 212223
Submitted by: Markus Kohlmeier <rootservice@gmail.com>
Reported by: Markus Kohlmeier <rootservice@gmail.com>
Approved by: ohauer (via mail)
MFH: 2016Q3
Diffstat (limited to 'mail/postfix-current/files/patch-src_tls_tls__server.c')
| -rw-r--r-- | mail/postfix-current/files/patch-src_tls_tls__server.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/mail/postfix-current/files/patch-src_tls_tls__server.c b/mail/postfix-current/files/patch-src_tls_tls__server.c new file mode 100644 index 000000000000..b9fb84e87acd --- /dev/null +++ b/mail/postfix-current/files/patch-src_tls_tls__server.c @@ -0,0 +1,29 @@ +--- src/tls/tls_server.c.orig 2016-08-27 20:27:50 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 +@@ -588,7 +588,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 |