diff options
| author | Erlang/OTP <[email protected]> | 2016-09-28 10:21:06 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-09-28 10:21:06 +0200 |
| commit | 83281b7c911abc34ba6359e88be39bada31073d8 (patch) | |
| tree | 05462266b7e6151ec01ecf69b6a7ec771514d267 /lib/ssl/src/tls_connection.erl | |
| parent | da8463b33de0201cea756e0690248f2185f1cccb (diff) | |
| parent | ca78bf1500c5f3c68d72214bd06fcc1b66a52c38 (diff) | |
| download | otp-83281b7c911abc34ba6359e88be39bada31073d8.tar.gz otp-83281b7c911abc34ba6359e88be39bada31073d8.tar.bz2 otp-83281b7c911abc34ba6359e88be39bada31073d8.zip | |
Merge branch 'ingela/ssl/ECC-selection-fix/OTP-13918' into maint-19
* ingela/ssl/ECC-selection-fix/OTP-13918:
ssl: Correct ECC curve selection, the error could cause default to always be selected.
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 763f1c7253..932bb139c1 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -237,9 +237,7 @@ error(_, _, _) -> #state{}) -> gen_statem:state_function_result(). %%-------------------------------------------------------------------- -hello(internal, #client_hello{client_version = ClientVersion, - extensions = #hello_extensions{ec_point_formats = EcPointFormats, - elliptic_curves = EllipticCurves}} = Hello, +hello(internal, #client_hello{client_version = ClientVersion} = Hello, #state{connection_states = ConnectionStates0, port = Port, session = #session{own_certificate = Cert} = Session0, renegotiation = {Renegotiation, _}, @@ -265,7 +263,6 @@ hello(internal, #client_hello{client_version = ClientVersion, negotiated_version = Version, hashsign_algorithm = HashSign, session = Session, - client_ecc = {EllipticCurves, EcPointFormats}, negotiated_protocol = Protocol}) end; hello(internal, #server_hello{} = Hello, |