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/ssl_handshake.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/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index da72ffc043..f5c0034f1b 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1287,7 +1287,7 @@ select_curve(#elliptic_curves{elliptic_curve_list = ClientCurves}, select_curve(undefined, _) -> %% Client did not send ECC extension use default curve if %% ECC cipher is negotiated - {namedCurve, ?secp256k1}; + {namedCurve, ?secp256r1}; select_curve(_, []) -> no_curve; select_curve(Curves, [Curve| Rest]) -> |