Attachment #192044 for bug #227165

View | Details | Raw Unified | Return to bug 227165
Collapse All | Expand All

Lines 96-102 Link Here

(-)mail/cyrus-imapd25/Makefile (-1 / +2 lines)
96	OSMAJOR= ${UNAMER:C/[.-].*//}	96	OSMAJOR= ${UNAMER:C/[.-].*//}
97		97
98	OPTIONS_RADIO= GSSAPI	98	OPTIONS_RADIO= GSSAPI
99	OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT	99	OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
100	.if exists(/usr/lib/libkrb5.a)	100	.if exists(/usr/lib/libkrb5.a)
101	OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE	101	OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE
102	.if ${OSMAJOR} >= 9	102	.if ${OSMAJOR} >= 9
Lines 112-117 Link Here
112	GSSAPI_MIT_USES= gssapi:mit	112	GSSAPI_MIT_USES= gssapi:mit
113	GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \	113	GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
114	--with-gss_impl=mit	114	--with-gss_impl=mit
		115	GSSAPI_NONE_CONFIGURE_ON= --disable-gssapi --without-gss_impl
115		116
116	MANDIRS= ${CYRUS_PREFIX}/man	117	MANDIRS= ${CYRUS_PREFIX}/man
117		118




--- imap/tls.c.orig	2017-05-09 00:40:13 UTC
+++ imap/tls.c
@@ -222,7 +222,8 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
 }
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#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)
@@ -726,7 +727,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 */

 
     const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);
 
@@ -1448,7 +1451,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 */

Return to bug 227165

Lines 1-15 Link Here

(-)mail/cyrus-imapd25/files/patch-imap__tls.c (-5 / +6 lines)
1	--- imap/tls.c.orig 2016-07-22 01:55:57 UTC	1	--- imap/tls.c.orig 2017-05-09 00:40:13 UTC
2	+++ imap/tls.c	2	+++ imap/tls.c
3	@@ -222,7 +222,7 @@ static RSA tmp_rsa_cb(SSL s __attribu	3	@@ -222,7 +222,8 @@ static RSA tmp_rsa_cb(SSL s __attribu
4	}	4	}
5	#endif	5	#endif
6		6
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
		9	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
9	/* replacements for new 1.1 API accessors */	10	/* replacements for new 1.1 API accessors */
10	/* XXX probably put these somewhere central */	11	/* XXX probably put these somewhere central */
11	static int DH_set0_pqg(DH dh, BIGNUM p, BIGNUM q, BIGNUM g)	12	static int DH_set0_pqg(DH dh, BIGNUM p, BIGNUM q, BIGNUM g)
12	@@ -723,7 +723,9 @@ EXPORTED int tls_init_serverengine(c	13	@@ -726,7 +727,9 @@ EXPORTED int tls_init_serverengine(c
13	off \|= SSL_OP_ALL; /* Work around all known bugs */	14	off \|= SSL_OP_ALL; /* Work around all known bugs */
14	off \|= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */	15	off \|= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */
15	off \|= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */	16	off \|= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */
Lines 19-25 Link Here
19		20
20	const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);	21	const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);
21		22
22	@@ -1441,7 +1443,9 @@ HIDDEN int tls_init_clientengine(int ver	23	@@ -1448,7 +1451,9 @@ HIDDEN int tls_init_clientengine(int ver
23	off \|= SSL_OP_ALL; /* Work around all known bugs */	24	off \|= SSL_OP_ALL; /* Work around all known bugs */
24	off \|= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */	25	off \|= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */
25	off \|= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */	26	off \|= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */