diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:28:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:28:40 +0100 |
| commit | d4046b68c706ce5c4485185738256e5d7bc88138 (patch) | |
| tree | 1a464f0e94883f2841d7da8f9de59aff0174c253 /lib/ssl/src/tls_connection.erl | |
| parent | bd6781bb72d35bd3bd994ef2ce49dad4eea473bb (diff) | |
| parent | 8de45496ceacdad8bc01a137d180602b089a8d65 (diff) | |
| download | otp-d4046b68c706ce5c4485185738256e5d7bc88138.tar.gz otp-d4046b68c706ce5c4485185738256e5d7bc88138.tar.bz2 otp-d4046b68c706ce5c4485185738256e5d7bc88138.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 8e6f80da1e..ffa04ee8ba 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -199,7 +199,9 @@ hello(start, #state{host = Host, port = Port, role = client, next_state(hello, hello, Record, State); hello(Hello = #client_hello{client_version = ClientVersion, - extensions = #hello_extensions{hash_signs = HashSigns}}, + extensions = #hello_extensions{hash_signs = HashSigns, + ec_point_formats = EcPointFormats, + elliptic_curves = EllipticCurves}}, State = #state{connection_states = ConnectionStates0, port = Port, session = #session{own_certificate = Cert} = Session0, renegotiation = {Renegotiation, _}, @@ -210,9 +212,7 @@ hello(Hello = #client_hello{client_version = ClientVersion, case tls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert}, Renegotiation) of {Version, {Type, Session}, - ConnectionStates, - #hello_extensions{ec_point_formats = EcPointFormats, - elliptic_curves = EllipticCurves} = ServerHelloExt} -> + ConnectionStates, ServerHelloExt} -> ssl_connection:hello({common_client_hello, Type, ServerHelloExt, HashSign}, State#state{connection_states = ConnectionStates, negotiated_version = Version, |