diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:14:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:57:03 +0100 |
| commit | c44caa428b65e85b034b01a7f6145e5fee60a863 (patch) | |
| tree | ab9e99da4400bf93cc2f512f10f1ebf66452fd80 /lib/ssl/src/ssl_connection.erl | |
| parent | e8ddbc58fda4ca07ff1f2f4d3c77ecae036ee513 (diff) | |
| parent | c2126443b79aa53c9fc04e7dad4e6c717ca6986b (diff) | |
| download | otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.gz otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.bz2 otp-c44caa428b65e85b034b01a7f6145e5fee60a863.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
lib/ssl/src/ssl_cipher_format.erl
lib/ssl/src/tls_handshake.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index af18ceb322..cd8baf0434 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -78,7 +78,7 @@ %%==================================================================== %%-------------------------------------------------------------------- -spec connect(tls_connection | dtls_connection, - host(), inet:port_number(), + ssl:host(), inet:port_number(), port() | {tuple(), port()}, %% TLS | DTLS {#ssl_options{}, #socket_options{}, %% Tracker only needed on server side @@ -144,7 +144,7 @@ handshake(#sslsocket{pid = [Pid|_]} = Socket, SslOptions, Timeout) -> end. %%-------------------------------------------------------------------- --spec handshake_continue(#sslsocket{}, [ssl_option()], +-spec handshake_continue(#sslsocket{}, [ssl:tls_server_option()], timeout()) -> {ok, #sslsocket{}}| {error, reason()}. %% %% Description: Continues handshake with new options @@ -2801,10 +2801,10 @@ handle_sni_extension(#sni{hostname = Hostname}, #state{static_env = #static_env{ session_cache = CacheHandle }, private_key = Key, - diffie_hellman_params = DHParams, - ssl_options = NewOptions, - sni_hostname = Hostname - } + diffie_hellman_params = DHParams, + ssl_options = NewOptions, + sni_hostname = Hostname + } end. update_ssl_options_from_sni(OrigSSLOptions, SNIHostname) -> |