diff options
| author | Péter Dimitrov <[email protected]> | 2019-04-29 09:08:16 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-04-29 09:08:16 +0200 |
| commit | 3fc3d282ee11ef974f426cfca867022084317370 (patch) | |
| tree | 9508171b2c280f607081ce04a50603f34e7c0dfa /lib/ssl/doc | |
| parent | cc804d6650f81617a4a6fd08617be43cf8aa6c2e (diff) | |
| parent | 4b9b216b0947e7b0b809cad6a1e486bd0a9f37ae (diff) | |
| download | otp-3fc3d282ee11ef974f426cfca867022084317370.tar.gz otp-3fc3d282ee11ef974f426cfca867022084317370.tar.bz2 otp-3fc3d282ee11ef974f426cfca867022084317370.zip | |
Merge branch 'peterdmv/ssl/tls13-poly-chacha/OTP-15383'
* peterdmv/ssl/tls13-poly-chacha/OTP-15383:
ssl: Update standards compliance
ssl: Enable additional ciphers for TLS 1.3
Change-Id: I2dc6eb73bc1b8809e7226e6b8e83f58b02a3e1e6
Diffstat (limited to 'lib/ssl/doc')
| -rw-r--r-- | lib/ssl/doc/src/standards_compliance.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/ssl/doc/src/standards_compliance.xml b/lib/ssl/doc/src/standards_compliance.xml index 25840d0fc6..ca98385f85 100644 --- a/lib/ssl/doc/src/standards_compliance.xml +++ b/lib/ssl/doc/src/standards_compliance.xml @@ -133,7 +133,8 @@ <list type="bulleted"> <item>Key Exchange: ECDHE</item> <item>Groups: all standard groups supported for the Diffie-Hellman key exchange</item> - <item>Ciphers: TLS_AES_128_GCM_SHA256 and TLS_AES_256_GCM_SHA384</item> + <item>Ciphers: TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384, + TLS_CHACHA20_POLY1305_SHA256 and TLS_AES_128_CCM_SHA256</item> <item>Signature Algorithms: RSA and RSA PSS</item> <item>Certificates: currently only certificates with RSA keys are supported</item> </list> @@ -1967,8 +1968,8 @@ <row> <cell align="left" valign="middle"></cell> <cell align="left" valign="middle">SHOULD implement the TLS_CHACHA20_POLY1305_SHA256</cell> - <cell align="left" valign="middle"><em>NC</em></cell> - <cell align="left" valign="middle"></cell> + <cell align="left" valign="middle"><em>C</em></cell> + <cell align="left" valign="middle">22</cell> </row> <row> @@ -2203,14 +2204,14 @@ <row> <cell align="left" valign="middle"></cell> <cell align="left" valign="middle">TLS_CHACHA20_POLY1305_SHA256</cell> - <cell align="left" valign="middle"><em>NC</em></cell> - <cell align="left" valign="middle"></cell> + <cell align="left" valign="middle"><em>C</em></cell> + <cell align="left" valign="middle">22</cell> </row> <row> <cell align="left" valign="middle"></cell> <cell align="left" valign="middle">TLS_AES_128_CCM_SHA256</cell> - <cell align="left" valign="middle"><em>NC</em></cell> - <cell align="left" valign="middle"></cell> + <cell align="left" valign="middle"><em>C</em></cell> + <cell align="left" valign="middle">22</cell> </row> <row> <cell align="left" valign="middle"></cell> |