diff options
| author | lloyd <[email protected]> | 2015-01-21 20:58:04 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-01-21 20:58:04 +0000 |
| commit | 316a7b79146e8003d33f50b58e1c6c3ba9874a32 (patch) | |
| tree | e9b049271ac1e4ff963e67caac30cb29f9e7b9a0 /doc/manual/tls.rst | |
| parent | 1f59fa09984cb364c1dc560043ffa735e1f23494 (diff) | |
Update TLS OCB ciphersuites to match draft-zauner-tls-aes-ocb-00
and enable them in the default build, though still not enabled in the
runtime policy.
Diffstat (limited to 'doc/manual/tls.rst')
| -rw-r--r-- | doc/manual/tls.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst index c2cdeb667..4ac7b5cb3 100644 --- a/doc/manual/tls.rst +++ b/doc/manual/tls.rst @@ -517,6 +517,9 @@ be negotiated during a handshake. Also allowed: "Camellia-256/GCM", "Camellia-128/GCM", "Camellia-256", "Camellia-128" + Also allowed (though currently experimental): "AES-128/OCB(12)", + "AES-256/OCB(12)" + Also allowed (although **not recommended**): "SEED", "3DES", "RC4" .. note:: |