aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-06-13 13:21:23 +0200
committerErlang/OTP <[email protected]>2016-06-13 13:21:23 +0200
commit2d2155e81f9c02592b39145d9c2a7b836ebf1c91 (patch)
treefb5aaa64f84f42e47f7ea599d0a4a621977a3852 /lib/ssl/src
parent60b02048d3b51e4e59d324f52d482dcb338b3c47 (diff)
parent0f26c3a6f70d9de52199a470cce1163908c223ff (diff)
downloadotp-2d2155e81f9c02592b39145d9c2a7b836ebf1c91.tar.gz
otp-2d2155e81f9c02592b39145d9c2a7b836ebf1c91.tar.bz2
otp-2d2155e81f9c02592b39145d9c2a7b836ebf1c91.zip
Merge branch 'ingela/maint/ssl/tls-1.2-available-hashsigns/OTP-13670' into maint-18
* ingela/maint/ssl/tls-1.2-available-hashsigns/OTP-13670: ssl: ordsets:intersection/2 did not give the expected result
Diffstat (limited to 'lib/ssl/src')
-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.