diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2021-03-30 11:10:17 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2021-03-30 11:10:17 +0000 |
| commit | 8c616ad3396c044ad1defcc4a6b73dfe1802bfc0 (patch) | |
| tree | f6adbc0fac8346cb7e9abbd741ca48c2d77e15b8 /mail/cyrus-imapd32/files/patch-imap__tls.c | |
| parent | Add a patch from upstream fixing build with older ncurses (diff) | |
better macro checking.
Reported by: nork
Notes
Notes:
svn path=/head/; revision=569547
Diffstat (limited to 'mail/cyrus-imapd32/files/patch-imap__tls.c')
| -rw-r--r-- | mail/cyrus-imapd32/files/patch-imap__tls.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/cyrus-imapd32/files/patch-imap__tls.c b/mail/cyrus-imapd32/files/patch-imap__tls.c index 0d907d05f701..cc43b5c26384 100644 --- a/mail/cyrus-imapd32/files/patch-imap__tls.c +++ b/mail/cyrus-imapd32/files/patch-imap__tls.c @@ -4,9 +4,9 @@ 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) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); @@ -14,9 +14,9 @@ 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) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif SSL_CTX_set_options(c_ctx, off); SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback); |