diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:35:39 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:35:39 +0100 |
| commit | 1c9c039449ab731049664e559d9507b84ff4b0d1 (patch) | |
| tree | a5f8bef47f173249a4bd8e216cbd64000ea2d0d9 /lib/ssl/src/tls_handshake.erl | |
| parent | 2597120931fc2834cc0eab9fc9cb676ed48aaa22 (diff) | |
| parent | c3c20d78c2b47d0dd117f7a90b817ed13a609e64 (diff) | |
| download | otp-1c9c039449ab731049664e559d9507b84ff4b0d1.tar.gz otp-1c9c039449ab731049664e559d9507b84ff4b0d1.tar.bz2 otp-1c9c039449ab731049664e559d9507b84ff4b0d1.zip | |
Merge branch 'ingela/merge/master'
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}| |