aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_handshake_SUITE.erl
diff options
context:
space:
mode:
authorDanil Zagoskin <[email protected]>2014-04-21 22:00:09 +0400
committerIngela Anderton Andin <[email protected]>2014-04-23 10:59:27 +0200
commitb4fc84117b6bd1105ca8ccb91f699564ac400dff (patch)
tree86106ff6431f3753613c4ee27114a1f31137445f /lib/ssl/test/ssl_handshake_SUITE.erl
parenta7446cd75e2a48e810faef26d91e9d70247297d1 (diff)
downloadotp-b4fc84117b6bd1105ca8ccb91f699564ac400dff.tar.gz
otp-b4fc84117b6bd1105ca8ccb91f699564ac400dff.tar.bz2
otp-b4fc84117b6bd1105ca8ccb91f699564ac400dff.zip
ssl: always pass negotiated version when selecting hashsign
Negotiated version is now always passed to ssl_handshake:select_hashsign because ssl_handshake:select_cert_hashsign has different rsa defaults on tlsv1.2 and older versions.
Diffstat (limited to 'lib/ssl/test/ssl_handshake_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_handshake_SUITE.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
index 4c4b8e5137..b4be768b58 100644
--- a/lib/ssl/test/ssl_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -101,5 +101,7 @@ encode_single_hello_sni_extension_correctly(_Config) ->
select_proper_tls_1_2_rsa_default_hashsign(_Config) ->
% RFC 5246 section 7.4.1.4.1 tells to use {sha1,rsa} as default signature_algorithm for RSA key exchanges
{sha, rsa} = ssl_handshake:select_cert_hashsign(undefined, ?rsaEncryption, {3,3}),
- {md5sha, rsa} = ssl_handshake:select_cert_hashsign(undefined, ?rsaEncryption, {undefined,undefined}).
+ % Older versions use MD5/SHA1 combination
+ {md5sha, rsa} = ssl_handshake:select_cert_hashsign(undefined, ?rsaEncryption, {3,2}),
+ {md5sha, rsa} = ssl_handshake:select_cert_hashsign(undefined, ?rsaEncryption, {3,0}).