diff options
| -rw-r--r-- | imap/ChangeLog | 4 | ||||
| -rw-r--r-- | imap/imapd-ssl.dist.in | 20 | ||||
| -rw-r--r-- | imap/pop3d-ssl.dist.in | 20 |
3 files changed, 41 insertions, 3 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog index e08cdd2..d05db6d 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1,3 +1,7 @@ +2014-10-21 坂元 英紀 <hs@on-sky.net> + + * Update comments in *ssl config files. + 2014-10-15 Rob Austein <sra@hactrn.net> * libs/tcpd/libcouriertls.c (tls_create): Set SSL_OP_NOSSLv3 flag, diff --git a/imap/imapd-ssl.dist.in b/imap/imapd-ssl.dist.in index 609c5aa..16fd181 100644 --- a/imap/imapd-ssl.dist.in +++ b/imap/imapd-ssl.dist.in @@ -112,7 +112,23 @@ COURIERTLS=@bindir@/couriertls # # DEFAULT: NORMAL:-CTYPE-OPENPGP # -# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP" +# This setting is also used to select the available ciphers. +# +# The actual list of available ciphers depend on the options GnuTLS was +# compiled against. The possible ciphers are: +# +# AES256, 3DES, AES128, ARC128, ARC40, RC2, DES, NULL +# +# Also, the following aliases: +# +# HIGH -- all ciphers that use more than a 128 bit key size +# MEDIUM -- all ciphers that use a 128 bit key size +# LOW -- all ciphers that use fewer than a 128 bit key size, the NULL cipher +# is not included +# ALL -- all ciphers except the NULL cipher +# +# See GnuTLS documentation, gnutls_priority_init(3) for additional +# documentation. ##NAME: TLS_PROTOCOL:0 # @@ -122,7 +138,7 @@ COURIERTLS=@bindir@/couriertls # # SSL3 - SSLv3 # SSL23 - all protocols (including TLS 1.x protocols) -# TLS1 - TLS1 +# TLSv1 - TLS1 # TLSv1.1 - TLS1.1 # TLSv1.2 - TLS1.2 # diff --git a/imap/pop3d-ssl.dist.in b/imap/pop3d-ssl.dist.in index 1164b77..49f3d39 100644 --- a/imap/pop3d-ssl.dist.in +++ b/imap/pop3d-ssl.dist.in @@ -96,6 +96,24 @@ COURIERTLS=@bindir@/couriertls # DEFAULT: NORMAL:-CTYPE-OPENPGP # # TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP" +# +# This setting is also used to select the available ciphers. +# +# The actual list of available ciphers depend on the options GnuTLS was +# compiled against. The possible ciphers are: +# +# AES256, 3DES, AES128, ARC128, ARC40, RC2, DES, NULL +# +# Also, the following aliases: +# +# HIGH -- all ciphers that use more than a 128 bit key size +# MEDIUM -- all ciphers that use a 128 bit key size +# LOW -- all ciphers that use fewer than a 128 bit key size, the NULL cipher +# is not included +# ALL -- all ciphers except the NULL cipher +# +# See GnuTLS documentation, gnutls_priority_init(3) for additional +# documentation. ##NAME: TLS_PROTOCOL:0 # @@ -105,7 +123,7 @@ COURIERTLS=@bindir@/couriertls # # SSL3 - SSLv3 # SSL23 - all protocols (including TLS 1.x protocols) -# TLS1 - TLS1 +# TLSv11 - TLS1 # TLSv1.1 - TLS1.1 # TLSv1.2 - TLS1.2 # |