diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:26:57 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:26:57 +0100 |
| commit | 8de45496ceacdad8bc01a137d180602b089a8d65 (patch) | |
| tree | 6f88d290168a65977b11e80614057a69a43603fe /lib/ssl/src/ssl_handshake.erl | |
| parent | c0b39f22abf34f6a0fb233418a02b2e6f41875e3 (diff) | |
| parent | caac6cb4f18750613460acd491da299bbe4a96cc (diff) | |
| download | otp-8de45496ceacdad8bc01a137d180602b089a8d65.tar.gz otp-8de45496ceacdad8bc01a137d180602b089a8d65.tar.bz2 otp-8de45496ceacdad8bc01a137d180602b089a8d65.zip | |
Merge branch 'ia/ssl/ECC-curve-selection/OTP-11575' into maint
* ia/ssl/ECC-curve-selection/OTP-11575:
ssl: Prepare for release
ssl: fix elliptic curve selection in server mode
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]) -> |