diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-10-07 10:15:13 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-10-07 10:15:13 +0200 |
| commit | 992bc0dad066bdec66996acae40b370b5377a161 (patch) | |
| tree | 6e9a55515adf86321c017e8757da133fa046afe7 /lib/ssl/doc/src/ssl.xml | |
| parent | 668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47 (diff) | |
| parent | 510e1a43f2d540c234a3d3672d80b07216c0eb0a (diff) | |
| download | otp-992bc0dad066bdec66996acae40b370b5377a161.tar.gz otp-992bc0dad066bdec66996acae40b370b5377a161.tar.bz2 otp-992bc0dad066bdec66996acae40b370b5377a161.zip | |
Merge branch 'ingela/ssl/cipher-type-spec' into maint
* ingela/ssl/cipher-type-spec:
ssl: Adjust cipher type to conform to implementation
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index abba5aaf59..68f2f97b6e 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -155,7 +155,7 @@ <tag><c>cipher() =</c></tag> <item><p><c>rc4_128 | des_cbc | '3des_ede_cbc' - | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm</c></p></item> + | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305</c></p></item> <tag><c>hash() =</c></tag> <item><p><c>md5 | sha | sha224 | sha256 | sha348 | sha512</c></p></item> |