diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-11-07 12:14:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-11-07 12:14:11 +0100 |
| commit | b15b46168df1e1c042a3c0a1ef1f83089df51de7 (patch) | |
| tree | 7cd94f15d4f14cc487b08db741522e065c2db33d /lib/ssl/src/tls_handshake.erl | |
| parent | 3311fcb8ad61af2f9f8194a863a5168d85d6fbcc (diff) | |
| parent | 3e06b82f0f29d90bff0783e7f3d1dabb435782f5 (diff) | |
| download | otp-b15b46168df1e1c042a3c0a1ef1f83089df51de7.tar.gz otp-b15b46168df1e1c042a3c0a1ef1f83089df51de7.tar.bz2 otp-b15b46168df1e1c042a3c0a1ef1f83089df51de7.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index a2486bf752..2bd103c18a 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -160,13 +160,15 @@ handle_client_hello(Version, #client_hello{session_id = SugesstedId, extensions = #hello_extensions{elliptic_curves = Curves, signature_algs = ClientHashSigns} = HelloExt}, #ssl_options{versions = Versions, - signature_algs = SupportedHashSigns} = SslOpts, + signature_algs = SupportedHashSigns, + eccs = SupportedECCs, + honor_ecc_order = ECCOrder} = SslOpts, {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert, _}, Renegotiation) -> case tls_record:is_acceptable_version(Version, Versions) of true -> AvailableHashSigns = ssl_handshake:available_signature_algs( ClientHashSigns, SupportedHashSigns, Cert, Version), - ECCCurve = ssl_handshake:select_curve(Curves, ssl_handshake:supported_ecc(Version)), + ECCCurve = ssl_handshake:select_curve(Curves, SupportedECCs, ECCOrder), {Type, #session{cipher_suite = CipherSuite} = Session1} = ssl_handshake:select_session(SugesstedId, CipherSuites, AvailableHashSigns, Compressions, Port, Session0#session{ecc = ECCCurve}, Version, |