diff options
| author | lloyd <[email protected]> | 2013-09-06 21:25:37 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2013-09-06 21:25:37 +0000 |
| commit | 183c1a131ef5cb6b80d440880d2ef78b1c8f5f4c (patch) | |
| tree | 262f82f0edfda0628d17fb387231010bfcdd706c /doc/tls.rst | |
| parent | c98fde26c96c764dbe821b7f76b7b3b93ac772bf (diff) | |
Enable CCM ciphersuites in TLS. Disable SHA-1 for signatures in TLS v1.2
Diffstat (limited to 'doc/tls.rst')
| -rw-r--r-- | doc/tls.rst | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/tls.rst b/doc/tls.rst index 93955d31c..8dd7d16ea 100644 --- a/doc/tls.rst +++ b/doc/tls.rst @@ -486,7 +486,9 @@ be negotiated during a handshake. Returns the list of ciphers we are willing to negotiate, in order of preference. - Default: "AES-256/GCM", "AES-128/GCM", "AES-256", "AES-128", "RC4" + Default: "AES-256/GCM", "AES-128/GCM", "AES-256/CCM(16,3)", + "AES-128/CCM(16,3)", "AES-256/CCM(8,3)", "AES-128/CCM(8,3)", + "AES-256", "AES-128", "RC4" Also allowed: "Camellia-256/GCM", "Camellia-128/GCM", "Camellia-256", "Camellia-128", "SEED", "3DES" @@ -518,9 +520,9 @@ be negotiated during a handshake. Returns the list of algorithms we are willing to use for public key signatures, in order of preference. - Default: "SHA-512", "SHA-384", "SHA-256", "SHA-224", "SHA-1" + Default: "SHA-512", "SHA-384", "SHA-256", "SHA-224" - Also allowed (although **not recommended**): "MD5" + Also allowed (although **not recommended**): "MD5", "SHA-1" .. note:: |