diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2020-05-04 07:57:53 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2020-05-04 07:57:53 +0000 |
| commit | 00bc8d415b885ae733e9c0edda63c721386f3587 (patch) | |
| tree | d191f07d47459c9e572d9c3a01c88bab543fb5cd /mail/cyrus-imapd32/files/patch-imap__tls.c | |
| parent | sysutils/busybox: update to 1.31.1 (diff) | |
Copy from cyrus-imapd30 for preparation of Cyrus IMAPd 3.2-RELEASE.
Notes
Notes:
svn path=/head/; revision=533898
Diffstat (limited to 'mail/cyrus-imapd32/files/patch-imap__tls.c')
| -rw-r--r-- | mail/cyrus-imapd32/files/patch-imap__tls.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mail/cyrus-imapd32/files/patch-imap__tls.c b/mail/cyrus-imapd32/files/patch-imap__tls.c new file mode 100644 index 000000000000..0d907d05f701 --- /dev/null +++ b/mail/cyrus-imapd32/files/patch-imap__tls.c @@ -0,0 +1,22 @@ +--- imap/tls.c.orig 2018-04-30 02:05:44 UTC ++++ imap/tls.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 */ ++#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); + +@@ -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 */ ++#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); |