diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2018-04-08 02:11:53 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2018-04-08 02:11:53 +0000 |
| commit | 4be94e67442735ff067319871b1b516f4ec2a1a5 (patch) | |
| tree | fa93130540ee68a25130b83c43c237077e6718b9 /mail | |
| parent | d025632608f79d911870ef1690d645264c1e2722 (diff) | |
| download | ports-4be94e67442735ff067319871b1b516f4ec2a1a5.tar.gz ports-4be94e67442735ff067319871b1b516f4ec2a1a5.zip | |
Fix build with LibreSSL 2.7
PR: 227165
Submitted by: brnrd
Notes
Notes:
svn path=/head/; revision=466766
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cyrus-imapd25/files/patch-imap__tls.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/cyrus-imapd25/files/patch-imap__tls.c b/mail/cyrus-imapd25/files/patch-imap__tls.c index 393fbbff7eef..13cf6a004568 100644 --- a/mail/cyrus-imapd25/files/patch-imap__tls.c +++ b/mail/cyrus-imapd25/files/patch-imap__tls.c @@ -1,15 +1,15 @@ ---- imap/tls.c.orig 2016-07-22 01:55:57 UTC +--- imap/tls.c.orig 2017-05-09 00:40:13 UTC +++ imap/tls.c @@ -222,7 +222,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu } #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* replacements for new 1.1 API accessors */ /* XXX probably put these somewhere central */ static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) -@@ -723,7 +723,9 @@ EXPORTED int tls_init_serverengine(c +@@ -726,7 +726,9 @@ EXPORTED int tls_init_serverengine(c off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ @@ -19,7 +19,7 @@ const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); -@@ -1441,7 +1443,9 @@ HIDDEN int tls_init_clientengine(int ver +@@ -1448,7 +1450,9 @@ HIDDEN int tls_init_clientengine(int ver off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ |