diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2018-04-08 02:13:01 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2018-04-08 02:13:01 +0000 |
| commit | 7e81200a85b7a1274104da7220b7dff41a63801a (patch) | |
| tree | 3de667553e19d622d992e8c9ef3d69c391db0dad /mail/cyrus-imapd30 | |
| parent | 4be94e67442735ff067319871b1b516f4ec2a1a5 (diff) | |
| download | ports-7e81200a85b7a1274104da7220b7dff41a63801a.tar.gz ports-7e81200a85b7a1274104da7220b7dff41a63801a.zip | |
Fix build with LibreSSL 2.7
PR: 227166
Submitted by: brnrd
Notes
Notes:
svn path=/head/; revision=466767
Diffstat (limited to 'mail/cyrus-imapd30')
| -rw-r--r-- | mail/cyrus-imapd30/files/patch-imap__tls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mail/cyrus-imapd30/files/patch-imap__tls.c b/mail/cyrus-imapd30/files/patch-imap__tls.c index 393fbbff7eef..6a69890a3b4f 100644 --- a/mail/cyrus-imapd30/files/patch-imap__tls.c +++ b/mail/cyrus-imapd30/files/patch-imap__tls.c @@ -1,15 +1,15 @@ ---- imap/tls.c.orig 2016-07-22 01:55:57 UTC +--- imap/tls.c.orig 2018-01-03 02:10:17 UTC +++ imap/tls.c -@@ -222,7 +222,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu +@@ -227,7 +227,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 +@@ -734,7 +734,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 +@@ -1465,7 +1467,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 */ |