aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_handshake.erl
diff options
context:
space:
mode:
authorDanil Zagoskin <[email protected]>2014-04-21 20:57:03 +0400
committerIngela Anderton Andin <[email protected]>2014-04-23 10:59:27 +0200
commita7446cd75e2a48e810faef26d91e9d70247297d1 (patch)
tree2c572c11e268108faae1fbb5c24bf64e6ab70c63 /lib/ssl/src/ssl_handshake.erl
parented1c35ea483db86d208335f43565026b12c426d6 (diff)
downloadotp-a7446cd75e2a48e810faef26d91e9d70247297d1.tar.gz
otp-a7446cd75e2a48e810faef26d91e9d70247297d1.tar.bz2
otp-a7446cd75e2a48e810faef26d91e9d70247297d1.zip
ssl: TLSv1.2: proper default sign algo for RSA
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
-rw-r--r--lib/ssl/src/ssl_handshake.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 10dd830baf..771fa6f377 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -635,6 +635,9 @@ select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert) ->
select_cert_hashsign(HashSign, _, {Major, Minor}) when HashSign =/= undefined andalso
Major >= 3 andalso Minor >= 3 ->
HashSign;
+select_cert_hashsign(undefined, ?rsaEncryption, {Major, Minor}) when
+ is_integer(Major) andalso Major >= 3 andalso is_integer(Minor) andalso Minor >= 3 ->
+ {sha, rsa};
select_cert_hashsign(undefined,?'id-ecPublicKey', _) ->
{sha, ecdsa};
select_cert_hashsign(undefined, ?rsaEncryption, _) ->