diff options
| -rw-r--r-- | mail/cyrus-imapd25/files/patch-imap__tls.c | 22 | ||||
| -rw-r--r-- | mail/cyrus-imapd25/files/patch-imtest__imtest.c | 12 | ||||
| -rw-r--r-- | mail/cyrus-imapd25/files/patch-lib__imclient.c | 12 |
3 files changed, 46 insertions, 0 deletions
diff --git a/mail/cyrus-imapd25/files/patch-imap__tls.c b/mail/cyrus-imapd25/files/patch-imap__tls.c new file mode 100644 index 000000000000..e23417eae130 --- /dev/null +++ b/mail/cyrus-imapd25/files/patch-imap__tls.c @@ -0,0 +1,22 @@ +--- imap/tls.c.orig 2015-11-30 06:30:33 UTC ++++ imap/tls.c +@@ -683,7 +683,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 */ ++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ ++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + + const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); + +@@ -1399,7 +1401,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 */ ++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ ++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + + SSL_CTX_set_options(c_ctx, off); + SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback); diff --git a/mail/cyrus-imapd25/files/patch-imtest__imtest.c b/mail/cyrus-imapd25/files/patch-imtest__imtest.c new file mode 100644 index 000000000000..2c80ed67bc66 --- /dev/null +++ b/mail/cyrus-imapd25/files/patch-imtest__imtest.c @@ -0,0 +1,12 @@ +--- imtest/imtest.c.orig 2015-11-30 06:30:33 UTC ++++ imtest/imtest.c +@@ -503,7 +503,9 @@ static 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 */ ++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ ++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + SSL_CTX_set_options(tls_ctx, off); + SSL_CTX_set_info_callback(tls_ctx, apps_ssl_info_callback); + diff --git a/mail/cyrus-imapd25/files/patch-lib__imclient.c b/mail/cyrus-imapd25/files/patch-lib__imclient.c new file mode 100644 index 000000000000..91705baf5ab8 --- /dev/null +++ b/mail/cyrus-imapd25/files/patch-lib__imclient.c @@ -0,0 +1,12 @@ +--- lib/imclient.c.orig 2015-11-30 06:30:33 UTC ++++ lib/imclient.c +@@ -1641,7 +1641,9 @@ static int tls_init_clientengine(struct + 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 */ ++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ ++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) + SSL_CTX_set_options(imclient->tls_ctx, off); + + /* debugging SSL_CTX_set_info_callback(imclient->tls_ctx, apps_ssl_info_callback); */ |