diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-10-14 12:19:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-10-14 12:19:02 +0200 |
| commit | ea8545dbeb69431da8fdbbde0db9e7847725e9db (patch) | |
| tree | d36853e8645a3ce02da2a2296ca1f35a343005d5 /lib/ssl/src/tls_handshake.erl | |
| parent | a4e990f68ebac4ee45306fe4642cf3582a9ab4ca (diff) | |
| parent | f13b2362c665ef2d98858a4601b1fecf31a21bb5 (diff) | |
| download | otp-ea8545dbeb69431da8fdbbde0db9e7847725e9db.tar.gz otp-ea8545dbeb69431da8fdbbde0db9e7847725e9db.tar.bz2 otp-ea8545dbeb69431da8fdbbde0db9e7847725e9db.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 02bfa69fc5..ecbca83e10 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -70,7 +70,7 @@ client_hello(Host, Port, ConnectionStates, }. %%-------------------------------------------------------------------- --spec server_hello(#session{}, tls_version(), #connection_states{}, +-spec server_hello(binary(), tls_version(), #connection_states{}, #hello_extensions{}) -> #server_hello{}. %% %% Description: Creates a server hello message. @@ -120,17 +120,16 @@ hello(#client_hello{client_version = ClientVersion, cipher_suites = CipherSuites, compression_methods = Compressions, random = Random, - extensions = HelloExt}, + extensions = #hello_extensions{elliptic_curves = Curves} = HelloExt}, #ssl_options{versions = Versions} = SslOpts, {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert}, Renegotiation) -> Version = ssl_handshake:select_version(tls_record, ClientVersion, Versions), case tls_record:is_acceptable_version(Version, Versions) of true -> - %% TODO: need to take supported Curves into Account when selecting the CipherSuite.... - %% if whe have an ECDSA cert with an unsupported curve, we need to drop ECDSA ciphers + ECCCurve = ssl_handshake:select_curve(Curves, ssl_handshake:supported_ecc(Version)), {Type, #session{cipher_suite = CipherSuite} = Session1} = ssl_handshake:select_session(SugesstedId, CipherSuites, Compressions, - Port, Session0, Version, + Port, Session0#session{ecc = ECCCurve}, Version, SslOpts, Cache, CacheCb, Cert), case CipherSuite of no_suite -> |