diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:18:49 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:18:49 +0100 |
| commit | 53dea65ae6665d5d14c0d313c1f639637a3f0405 (patch) | |
| tree | 60f74599bbfa18f883b37390033232fd5cc3a640 /lib/ssl/src/tls_handshake.erl | |
| parent | cb9b1267f2465a129a1f5de5cf812bcfd5a7a9f4 (diff) | |
| parent | 3058ef6bb7a2a3f96cfde819976ee7a52be65364 (diff) | |
| download | otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.tar.gz otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.tar.bz2 otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.zip | |
Merge branch 'ingela/ssl/doc-enhancements' into maint
* ingela/ssl/doc-enhancements:
ssl: Enhance documentation after "use-spec-rewrite"
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 fbb81f56fe..0f0de5936a 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -82,7 +82,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}| |