diff options
| author | Sam Varshavchik | 2017-07-25 20:29:53 -0400 |
|---|---|---|
| committer | Sam Varshavchik | 2017-07-25 20:37:01 -0400 |
| commit | ad219be4de0f2e1416afe5857afbb3badd520aca (patch) | |
| tree | f9f064393e797b603055460d5b51ae951583fbea /imap | |
| parent | 5f52fae452bac6c6db4b578b4667b8e9bc0901e0 (diff) | |
| download | courier-libs-ad219be4de0f2e1416afe5857afbb3badd520aca.tar.bz2 | |
Partially revert de2a130974e1a76daa1893e18442154c7fc90321.
Put back TLS_PROTOCOL, but use only SSLv23_method, replacing deprecated
methods with stubs for their + versions.
Diffstat (limited to 'imap')
| -rw-r--r-- | imap/imapd-ssl.dist.in.git | 11 | ||||
| -rw-r--r-- | imap/pop3d-ssl.dist.in.git | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/imap/imapd-ssl.dist.in.git b/imap/imapd-ssl.dist.in.git index 3fe9334..df5cf02 100644 --- a/imap/imapd-ssl.dist.in.git +++ b/imap/imapd-ssl.dist.in.git @@ -136,14 +136,11 @@ COURIERTLS=@bindir@/couriertls # # OpenSSL: # -# TLSv1 - TLS1 -# TLSv1.1 - TLS1.1 -# TLSv1.2 - TLS1.2 +# TLSv1 - TLS 1.0, or higher. +# TLSv1.1 - TLS1.1, or higher. +# TLSv1.2 - TLS1.2, or higher. # -# TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all -# higher protocols. -# -# The default value is TLSv1+ +# The default value is TLSv1 ##NAME: TLS_CIPHER_LIST:0 # diff --git a/imap/pop3d-ssl.dist.in.git b/imap/pop3d-ssl.dist.in.git index b11ac08..43a68e5 100644 --- a/imap/pop3d-ssl.dist.in.git +++ b/imap/pop3d-ssl.dist.in.git @@ -121,14 +121,11 @@ COURIERTLS=@bindir@/couriertls # # OpenSSL: # -# TLSv11 - TLS1 -# TLSv1.1 - TLS1.1 -# TLSv1.2 - TLS1.2 +# TLSv1 - TLS 1.0, or higher. +# TLSv1.1 - TLS1.1, or higher. +# TLSv1.2 - TLS1.2, or higher. # -# TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all -# higher protocols. -# -# The default value is TLSv1+ +# The default value is TLSv1. ##NAME: TLS_STARTTLS_PROTOCOL:0 # |