diff options
author | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:29:37 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:29:37 +0100 |
commit | c3c20d78c2b47d0dd117f7a90b817ed13a609e64 (patch) | |
tree | d1e86dd4499cee4dc4fa4cd4df533f358aabf652 /lib/ssl/src/tls_handshake.erl | |
parent | 4327304462128ce983de8e962f683e702a80f64e (diff) | |
parent | 53dea65ae6665d5d14c0d313c1f639637a3f0405 (diff) | |
download | otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.tar.gz otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.tar.bz2 otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.zip |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
-rw-r--r-- | lib/ssl/src/tls_handshake.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index a1397047f2..e7cee1956b 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -98,7 +98,7 @@ client_hello(Host, Port, ConnectionStates, -spec hello(#server_hello{} | #client_hello{}, #ssl_options{}, ssl_record:connection_states() | {inet:port_number(), #session{}, db_handle(), atom(), ssl_record:connection_states(), - binary() | undefined, ssl:key_algo()}, + binary() | undefined, ssl:kex_algo()}, boolean()) -> {tls_record:tls_version(), ssl:session_id(), ssl_record:connection_states(), alpn | npn, binary() | undefined}| |