diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-06 15:49:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-06 15:49:12 +0200 |
| commit | b0d29cc77f3c8d4d63dabb2f00570b0130f9f175 (patch) | |
| tree | cbc19b39413ef5cf12d1630d3a6def9b1e9f1ccd /lib/ssl/src/ssl.erl | |
| parent | 08ff462b9302f62aafa20c1978d5ca148f03cdd3 (diff) | |
| parent | 01e9582332fd17aad51a8b6a4212f72387699359 (diff) | |
| download | otp-b0d29cc77f3c8d4d63dabb2f00570b0130f9f175.tar.gz otp-b0d29cc77f3c8d4d63dabb2f00570b0130f9f175.tar.bz2 otp-b0d29cc77f3c8d4d63dabb2f00570b0130f9f175.zip | |
Merge branch 'ingela/ssl/dtls-progress/connection-states-as-maps' into maint
* ingela/ssl/dtls-progress/connection-states-as-maps:
dtls: fix encoding of client hello cookie
dtls: Prepare start of DTLS connection manager with SSL app
ssl: Refactor to use maps for the connection states
ssl, dtls: Refactor sni handling
dtls: Add close/5
dtls: Add renegotiate/2
dtls: Add protocol event handling
ssl: Refactor code so that tls and dtls can share more code
ssl, dtls: Disable V2 compatibility clause from ssl_handshake:update_handshake_history
ssl: Make sure common code for TLS and DTLS uses the TLS Version
ssl: remove unused RecordCB argument from master_secret
dtls: Add reinit_handshake_data/1 to dtls
dtls: replace tls_record with RecordCB in connection_info
Fix version numbers and dependencies
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index d2aeb3258f..27b753af2e 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -43,7 +43,7 @@ renegotiate/1, prf/5, negotiated_protocol/1, negotiated_next_protocol/1, connection_information/1, connection_information/2]). %% Misc --export([handle_options/2]). +-export([handle_options/2, tls_version/1]). -deprecated({negotiated_next_protocol, 1, next_major_release}). -deprecated({connection_info, 1, next_major_release}). @@ -607,6 +607,11 @@ format_error(Error) -> Other end. +tls_version({3, _} = Version) -> + Version; +tls_version({254, _} = Version) -> + dtls_v1:corresponding_tls_version(Version). + %%%-------------------------------------------------------------- %%% Internal functions %%%-------------------------------------------------------------------- |