diff options
| author | Péter Dimitrov <[email protected]> | 2019-06-11 09:57:10 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-06-11 09:57:10 +0200 |
| commit | 2893902fe98daa0f2e93902f794aa101c70d7acc (patch) | |
| tree | 47511d70b9ba37fab2810c4697561023d1396e89 /lib/ssl/doc | |
| parent | 626c68069acca0a5178478e0aad9710a472d3dd6 (diff) | |
| parent | f4b64d3ddaaedf29c81a32af291104279fbbfdce (diff) | |
| download | otp-2893902fe98daa0f2e93902f794aa101c70d7acc.tar.gz otp-2893902fe98daa0f2e93902f794aa101c70d7acc.tar.bz2 otp-2893902fe98daa0f2e93902f794aa101c70d7acc.zip | |
Merge branch 'maint'
* maint:
ssl: Update standards compliance
ssl: Fix alert handling (TLS 1.3)
ssl: Add tests for ALPN in TLS 1.3
ssl: Implement ALPN in TLS 1.3
ssl: Add TLS 1.3 test group to ssl_certificate_verify_SUITE
ssl: Fix negative tests in ssl_basic_SUITE
Diffstat (limited to 'lib/ssl/doc')
| -rw-r--r-- | lib/ssl/doc/src/standards_compliance.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/doc/src/standards_compliance.xml b/lib/ssl/doc/src/standards_compliance.xml index 3bd86178c8..3a472d4776 100644 --- a/lib/ssl/doc/src/standards_compliance.xml +++ b/lib/ssl/doc/src/standards_compliance.xml @@ -340,8 +340,8 @@ <row> <cell align="left" valign="middle"></cell> <cell align="left" valign="middle">application_layer_protocol_negotiation (RFC7301)</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"><em>22.1</em></cell> </row> <row> <cell align="left" valign="middle"></cell> @@ -479,8 +479,8 @@ <row> <cell align="left" valign="middle"></cell> <cell align="left" valign="middle">application_layer_protocol_negotiation (RFC7301)</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"><em>22.1</em></cell> </row> <row> <cell align="left" valign="middle"></cell> |