diff options
| author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
| commit | 49d86a43c207f4825f7242f34a7cc8d3584993a7 (patch) | |
| tree | e07c3cd02b9bf8181e9ad4d1c0deade2dff71376 /lib/ssl/src/tls_handshake.erl | |
| parent | f8ff2711258e4b30f9a984dfc27fd66cffe26b5f (diff) | |
| parent | 7a3abea5ed893338e5691f87a782a0320e5ce270 (diff) | |
| download | otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.tar.gz otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.tar.bz2 otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.zip | |
Merge branch 'ingela/ssl/maint/algo-fixes/OTP-13525' into maint-18
* ingela/ssl/maint/algo-fixes/OTP-13525:
ssl: Correct guard expression
ssl: Correct cipher suites conversion
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index ef718c13df..102dbba198 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -278,10 +278,11 @@ handle_server_hello_extensions(Version, SessionId, Random, CipherSuite, {Version, SessionId, ConnectionStates, ProtoExt, Protocol} end. -available_signature_algs(undefined, SupportedHashSigns, _, {Major, Minor}) when (Major < 3) andalso (Minor < 3) -> +available_signature_algs(undefined, SupportedHashSigns, _, {Major, Minor}) when + (Major >= 3) andalso (Minor >= 3) -> SupportedHashSigns; available_signature_algs(#hash_sign_algos{hash_sign_algos = ClientHashSigns}, SupportedHashSigns, - _, {Major, Minor}) when (Major < 3) andalso (Minor < 3) -> + _, {Major, Minor}) when (Major >= 3) andalso (Minor >= 3) -> ordsets:intersection(ClientHashSigns, SupportedHashSigns); available_signature_algs(_, _, _, _) -> undefined. |