diff options
| author | Fredrik Gustafsson <fredrik@erlang.org> | 2013-02-28 09:39:43 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <fredrik@erlang.org> | 2013-02-28 09:39:43 +0100 |
| commit | db9af15041a88184ffb015b699708017275f8c9e (patch) | |
| tree | 0ec0e2f00aea1df6d152fae063b2d79a3a48fa11 /lib/ssl/src/ssl_record.erl | |
| parent | 715339824e815e15d7ab396e219ef3135392be23 (diff) | |
| parent | fe59c116358d8c79525eff4d5d4e9c76be2bb400 (diff) | |
| download | erlang-db9af15041a88184ffb015b699708017275f8c9e.tar.gz | |
Merge branch 'as/tls-psk-srp-suites-ECC' into master-pumaster-pu
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 173b9611c6..5101beeac8 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -704,12 +704,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()). |