aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-02 15:22:59 +0200
committerIngela Anderton Andin <[email protected]>2016-05-02 15:22:59 +0200
commit91f993a9cc173ad51b2d44b2e4cc09de9975f1d1 (patch)
tree7254388cdbf55dc73e4d30b4aa37aae225980703
parent4c8eef579cfe23642c05f6aad0febee4b0d1d6f2 (diff)
parente8c845c56c137c457bf950abe653322c94bbc43a (diff)
downloadotp-91f993a9cc173ad51b2d44b2e4cc09de9975f1d1.tar.gz
otp-91f993a9cc173ad51b2d44b2e4cc09de9975f1d1.tar.bz2
otp-91f993a9cc173ad51b2d44b2e4cc09de9975f1d1.zip
Merge branch 'ingela/ssl/signature_algs_bug'
* ingela/ssl/signature_algs_bug: ssl: Correct guard expression
-rw-r--r--lib/ssl/src/tls_handshake.erl5
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.