6 files changed, 17 insertions, 33 deletions
diff --git a/lib/ssl/src/ssl_certificate_db.erl b/lib/ssl/src/ssl_certificate_db.erl
index ff36b5ee26..cdff73336e 100644
--- a/lib/ssl/src/ssl_certificate_db.erl
+++ b/lib/ssl/src/ssl_certificate_db.erl
@@ -100,7 +100,7 @@ add_trusted_certs(_Pid, {der, DerList}, [CerDb, _,_]) ->
     {ok, NewRef};
 
 add_trusted_certs(_Pid, File, [CertsDb, RefDb, PemChache] = Db) ->
-    MD5 = crypto:md5(File),
+    MD5 = crypto:hash(md5, File),
     case lookup_cached_pem(Db, MD5) of
 	[{_Content, Ref}] ->
 	    ref_count(Ref, RefDb, 1),
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index bddae820ef..eca36ba650 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -696,8 +696,8 @@ decrypt_premaster_secret(Secret, RSAPrivateKey) ->
 %% Description: Calculate server key exchange hash
 %%--------------------------------------------------------------------
 server_key_exchange_hash(md5sha, Value) ->
-    MD5 = crypto:md5(Value),
-    SHA = crypto:sha(Value),
+    MD5 = crypto:hash(md5, Value),
+    SHA = crypto:hash(sha, Value),
     <<MD5/binary, SHA/binary>>;
 
 server_key_exchange_hash(Hash, Value) ->
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index aa9da65bb8..caea528a08 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -103,7 +103,7 @@ connection_init(Trustedcerts, Role) ->
 %% Description: Cach a pem file and return its content.
 %%--------------------------------------------------------------------
 cache_pem_file(File, DbHandle) ->
-    MD5 = crypto:md5(File),
+    MD5 = crypto:hash(md5, File),
     case ssl_certificate_db:lookup_cached_pem(DbHandle, MD5) of
 	[{Content,_}] ->
 	    {ok, Content};
@@ -468,7 +468,7 @@ new_id(Port, Tries, Cache, CacheCb) ->
 clean_cert_db(Ref, CertDb, RefDb, PemCache, File) ->
     case ssl_certificate_db:ref_count(Ref, RefDb, 0) of
 	0 ->	  
-	    MD5 = crypto:md5(File),
+	    MD5 = crypto:hash(md5, File),
 	    case ssl_certificate_db:lookup_cached_pem(PemCache, MD5) of
 		[{Content, Ref}] ->
 		    ssl_certificate_db:insert(MD5, Content, PemCache);		
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()).
diff --git a/lib/ssl/src/ssl_ssl3.erl b/lib/ssl/src/ssl_ssl3.erl
index a11c5b8c0c..013c27ebb5 100644
--- a/lib/ssl/src/ssl_ssl3.erl
+++ b/lib/ssl/src/ssl_ssl3.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -154,9 +154,9 @@ suites() ->
 %%--------------------------------------------------------------------
 
 hash(?MD5, Data) ->
-    crypto:md5(Data);
+    crypto:hash(md5, Data);
 hash(?SHA, Data) ->
-    crypto:sha(Data).
+    crypto:hash(sha, Data).
 
 %%pad_1(?NULL) ->
 %%    "";
@@ -198,6 +198,6 @@ gen(_Secret, _All, Wanted, Len, _C, _N, Acc) when Wanted =< Len ->
     Block;
 gen(Secret, All, Wanted, Len, C, N, Acc) ->
     Prefix = lists:duplicate(N, C),
-    SHA = crypto:sha([Prefix, All]),
-    MD5 = crypto:md5([Secret, SHA]),
+    SHA = crypto:hash(sha, [Prefix, All]),
+    MD5 = crypto:hash(md5, [Secret, SHA]),
     gen(Secret, All, Wanted, Len + 16, C+1, N+1, [MD5 | Acc]).
diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/ssl_tls1.erl
index 39931ff29f..507b1de904 100644
--- a/lib/ssl/src/ssl_tls1.erl
+++ b/lib/ssl/src/ssl_tls1.erl
@@ -58,8 +58,8 @@ finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
     %%      verify_data
     %%          PRF(master_secret, finished_label, MD5(handshake_messages) +
     %%          SHA-1(handshake_messages)) [0..11];
-    MD5 = crypto:md5(Handshake),
-    SHA = crypto:sha(Handshake),
+    MD5 = crypto:hash(md5, Handshake),
+    SHA = crypto:hash(sha, Handshake),
     prf(?MD5SHA, MasterSecret, finished_label(Role), [MD5, SHA], 12);
 
 finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
@@ -77,8 +77,8 @@ finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
 -spec certificate_verify(md5sha | sha, integer(), [binary()]) -> binary().
 
 certificate_verify(md5sha, _Version, Handshake) ->
-    MD5 = crypto:md5(Handshake),
-    SHA = crypto:sha(Handshake),
+    MD5 = crypto:hash(md5, Handshake),
+    SHA = crypto:hash(sha, Handshake),
     <<MD5/binary, SHA/binary>>;
 
 certificate_verify(HashAlgo, _Version, Handshake) ->
@@ -248,16 +248,8 @@ suites(Minor) when Minor == 3 ->
 %%%% HMAC and the Pseudorandom Functions RFC 2246 & 4346 - 5.%%%%
 hmac_hash(?NULL, _, _) ->
     <<>>;
-hmac_hash(?MD5, Key, Value) ->
-    crypto:md5_mac(Key, Value);
-hmac_hash(?SHA, Key, Value) ->
-    crypto:sha_mac(Key, Value);
-hmac_hash(?SHA256, Key, Value) ->
-    crypto:sha256_mac(Key, Value);
-hmac_hash(?SHA384, Key, Value) ->
-    crypto:sha384_mac(Key, Value);
-hmac_hash(?SHA512, Key, Value) ->
-    crypto:sha512_mac(Key, Value).
+hmac_hash(Alg, Key, Value) ->
+    crypto:hmac(mac_algo(Alg), Key, Value).
 
 mac_algo(?MD5)    -> md5;
 mac_algo(?SHA)    -> sha;