diff options
author | Ingela Anderton Andin <[email protected]> | 2013-05-08 10:50:32 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-05-08 10:50:32 +0200 |
commit | 5413bda055761104f70f091b7fe69c8a6a261c9c (patch) | |
tree | 8afeaae8b9b96b034642dbed3f3306785f0272c7 /lib/ssl/src/ssl_record.erl | |
parent | a38dde7003ea204979985e6784a4559e8123a66e (diff) | |
parent | 705e3b1137ebb2cfa1e729c9a4cf44638270f7e5 (diff) | |
download | otp-5413bda055761104f70f091b7fe69c8a6a261c9c.tar.gz otp-5413bda055761104f70f091b7fe69c8a6a261c9c.tar.bz2 otp-5413bda055761104f70f091b7fe69c8a6a261c9c.zip |
Merge remote-tracking branch 'upstream/maint'
Conflicts:
lib/crypto/doc/src/crypto_app.xml
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
-rw-r--r-- | lib/ssl/src/ssl_record.erl | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl index 26aca56739..50b1b2cda9 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -712,12 +712,4 @@ mac_hash({3, N} = Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment) Length, Fragment). sufficient_tlsv1_2_crypto_support() -> - Data = "Sampl", - Data2 = "e #1", - Key = <<0,1,2,3,16,17,18,19,32,33,34,35,48,49,50,51,4,5,6,7,20,21,22,23,36,37,38,39, - 52,53,54,55,8,9,10,11,24,25,26,27,40,41,42,43,56,57,58,59>>, - try - crypto:sha256_mac(Key, lists:flatten([Data, Data2])), - true - catch _:_ -> false - end. + proplists:get_bool(sha256, crypto:algorithms()). |