aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-10 12:40:21 +0200
committerIngela Anderton Andin <[email protected]>2016-05-10 12:40:21 +0200
commit781c493a49485af43037cff6212e854472d7dcdb (patch)
tree5a2e7ad9062717739d9c985b6d430929b9edf0b7 /lib
parenta4839ee6be00ef53f3aee7f01bc3b50cc7fb4a59 (diff)
parent07953e9d711962b0cb083098d51697d27b5cb292 (diff)
downloadotp-781c493a49485af43037cff6212e854472d7dcdb.tar.gz
otp-781c493a49485af43037cff6212e854472d7dcdb.tar.bz2
otp-781c493a49485af43037cff6212e854472d7dcdb.zip
Merge branch 'ingela/ssl/tls-1.2-available-hashsigns'
* ingela/ssl/tls-1.2-available-hashsigns: ssl: ordsets:intersection/2 did not give the expected result
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/src/tls_handshake.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index 102dbba198..f34eebb0e4 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -283,7 +283,8 @@ available_signature_algs(undefined, SupportedHashSigns, _, {Major, Minor}) when
SupportedHashSigns;
available_signature_algs(#hash_sign_algos{hash_sign_algos = ClientHashSigns}, SupportedHashSigns,
_, {Major, Minor}) when (Major >= 3) andalso (Minor >= 3) ->
- ordsets:intersection(ClientHashSigns, SupportedHashSigns);
+ sets:to_list(sets:intersection(sets:from_list(ClientHashSigns),
+ sets:from_list(SupportedHashSigns)));
available_signature_algs(_, _, _, _) ->
undefined.