Merge remote-tracking branch 'upstream/maint'

Conflicts:
	bootstrap/lib/stdlib/ebin/beam_lib.beam
	lib/public_key/test/erl_make_certs.erl

39 files changed, 4207 insertions, 2695 deletions

diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index c35cbd3c08..9bb9817001 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -599,7 +599,7 @@ encrypt_config_file(SrcFileName, EncryptFileName, {file,KeyFile}) ->
 
 encrypt_config_file(SrcFileName, EncryptFileName, {key,Key}) ->
     crypto:start(),
-    {K1,K2,K3,IVec} = make_crypto_key(Key),
+    {Key,IVec} = make_crypto_key(Key),
     case file:read_file(SrcFileName) of
 	{ok,Bin0} ->
 	    Bin1 = term_to_binary({SrcFileName,Bin0}),
@@ -607,7 +607,7 @@ encrypt_config_file(SrcFileName, EncryptFileName, {key,Key}) ->
 		       0 -> Bin1;
 		       N -> list_to_binary([Bin1,random_bytes(8-N)])
 		   end,
-	    EncBin = crypto:des3_cbc_encrypt(K1, K2, K3, IVec, Bin2),
+	    EncBin = crypto:block_encrypt(des3_cbc, Key, IVec, Bin2),
 	    case file:write_file(EncryptFileName, EncBin) of
 		ok ->
 		    io:format("~ts --(encrypt)--> ~ts~n",
@@ -638,10 +638,10 @@ decrypt_config_file(EncryptFileName, TargetFileName, {file,KeyFile}) ->
 
 decrypt_config_file(EncryptFileName, TargetFileName, {key,Key}) ->
     crypto:start(),
-    {K1,K2,K3,IVec} = make_crypto_key(Key),
+    {Key,IVec} = make_crypto_key(Key),
     case file:read_file(EncryptFileName) of
 	{ok,Bin} ->
-	    DecBin = crypto:des3_cbc_decrypt(K1, K2, K3, IVec, Bin),
+	    DecBin = crypto:block_decrypt(des3_cbc, Key, IVec, Bin),
 	    case catch binary_to_term(DecBin) of
 		{'EXIT',_} ->
 		    {error,bad_file};
@@ -713,7 +713,7 @@ get_crypt_key_from_file() ->
 make_crypto_key(String) ->
     <<K1:8/binary,K2:8/binary>> = First = erlang:md5(String),
     <<K3:8/binary,IVec:8/binary>> = erlang:md5([First|lists:reverse(String)]),
-    {K1,K2,K3,IVec}.
+    {[K1,K2,K3],IVec}.
 
 random_bytes(N) ->
     {A,B,C} = now(),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 54526e8e83..0535eb924b 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 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
@@ -1035,10 +1035,12 @@ make_dsa_files(Config, Type) ->
     file:write_file(DSAPrivateFile, PemBin),
     ok.
 
+
 %%--------------------------------------------------------------------
-%% Creates a dsa key (OBS: for testing only)
+%% @doc Creates a dsa key (OBS: for testing only)
 %%   the sizes are in bytes
-%% gen_dsa(::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
 %%--------------------------------------------------------------------
 gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
     Key = gen_dsa2(LSize, NSize),
@@ -1048,7 +1050,6 @@ encode_key(Key = #'DSAPrivateKey'{}) ->
     Der = public_key:der_encode('DSAPrivateKey', Key),
     {'DSAPrivateKey', Der, not_encrypted}.
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% DSA key generation  (OBS: for testing only)
 %% See http://en.wikipedia.org/wiki/Digital_Signature_Algorithm
@@ -1058,67 +1059,70 @@ gen_dsa2(LSize, NSize) ->
     Q  = prime(NSize),  %% Choose N-bit prime Q
     X0 = prime(LSize),
     P0 = prime((LSize div 2) +1),
-
+    
     %% Choose L-bit prime modulus P such that p-1 is a multiple of q.
     case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
-	error ->
+	error -> 
 	    gen_dsa2(LSize, NSize);
-	P ->
-	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	P ->	    
+	    G = crypto:mod_pow(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
 	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
-
+	    
 	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
-	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
-
-	    #'DSAPrivateKey'{version=0, p=P, q=Q, g=G, y=Y, x=X}
+	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
+	    
+	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
+			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
     end.
-
+    
 %% See fips_186-3.pdf
 dsa_search(T, P0, Q, Iter) when Iter > 0 ->
     P = 2*T*Q*P0 + 1,
-    case is_prime(crypto:mpint(P), 50) of
+    case is_prime(P, 50) of
 	true -> P;
 	false -> dsa_search(T+1, P0, Q, Iter-1)
     end;
-dsa_search(_,_,_,_) ->
+dsa_search(_,_,_,_) -> 
     error.
 
 
 %%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 prime(ByteSize) ->
     Rand = odd_rand(ByteSize),
-    crypto:erlint(prime_odd(Rand, 0)).
+    prime_odd(Rand, 0).
 
 prime_odd(Rand, N) ->
     case is_prime(Rand, 50) of
-	true ->
+	true -> 
 	    Rand;
-	false ->
-	    NotPrime = crypto:erlint(Rand),
-	    prime_odd(crypto:mpint(NotPrime+2), N+1)
+	false -> 
+	    prime_odd(Rand+2, N+1)
     end.
 
 %% see http://en.wikipedia.org/wiki/Fermat_primality_test
 is_prime(_, 0) -> true;
-is_prime(Candidate, Test) ->
-    CoPrime = odd_rand(<<0,0,0,4, 10000:32>>, Candidate),
-    case crypto:mod_exp(CoPrime, Candidate, Candidate) of
-	CoPrime -> is_prime(Candidate, Test-1);
-	_       -> false
-    end.
+is_prime(Candidate, Test) -> 
+    CoPrime = odd_rand(10000, Candidate),
+    Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
+    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
+
+is_prime(CoPrime, CoPrime, Candidate, Test) ->
+    is_prime(Candidate, Test-1);
+is_prime(_,_,_,_) ->
+    false.
 
 odd_rand(Size) ->
     Min = 1 bsl (Size*8-1),
     Max = (1 bsl (Size*8))-1,
-    odd_rand(crypto:mpint(Min), crypto:mpint(Max)).
+    odd_rand(Min, Max).
 
 odd_rand(Min,Max) ->
-    Rand = <<Sz:32, _/binary>> = crypto:rand_uniform(Min,Max),
-    BitSkip = (Sz+4)*8-1,
-    case Rand of
-	Odd  = <<_:BitSkip,  1:1>> -> Odd;
-	Even = <<_:BitSkip,  0:1>> ->
-	    crypto:mpint(crypto:erlint(Even)+1)
+    Rand = crypto:rand_uniform(Min,Max),
+    case Rand rem 2 of
+	0 -> 
+	    Rand + 1;
+	_ -> 
+	    Rand
     end.
 
 copyfile(SrcDir, DstDir, Fn) ->
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 745f1d5cf9..2ca403de54 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -1197,9 +1197,9 @@ abstract_code(#compile{code=Code,options=Opts,ofile=OFile}) ->
 
 encrypt_abs_code(Abstr, Key0) ->
     try
-	{Mode,RealKey} = generate_key(Key0),
+	RealKey = generate_key(Key0),
 	case start_crypto() of
-	    ok -> {ok,encrypt(Mode, RealKey, Abstr)};
+	    ok -> {ok,encrypt(RealKey, Abstr)};
 	    {error,_}=E -> E
 	end
     catch
@@ -1216,19 +1216,19 @@ start_crypto() ->
 	    {error,[{none,?MODULE,no_crypto}]}
     end.
 
-generate_key({Mode,String}) when is_atom(Mode), is_list(String) ->
-    {Mode,beam_lib:make_crypto_key(Mode, String)};
+generate_key({Type,String}) when is_atom(Type), is_list(String) ->
+    beam_lib:make_crypto_key(Type, String);
 generate_key(String) when is_list(String) ->
     generate_key({des3_cbc,String}).
 
-encrypt(des3_cbc=Mode, {K1,K2,K3, IVec}, Bin0) ->
-    Bin1 = case byte_size(Bin0) rem 8 of
+encrypt({des3_cbc=Type,Key,IVec,BlockSize}, Bin0) ->
+    Bin1 = case byte_size(Bin0) rem BlockSize of
 	       0 -> Bin0;
-	       N -> list_to_binary([Bin0,random_bytes(8-N)])
+	       N -> list_to_binary([Bin0,random_bytes(BlockSize-N)])
 	   end,
-    Bin = crypto:des3_cbc_encrypt(K1, K2, K3, IVec, Bin1),
-    ModeString = atom_to_list(Mode),
-    list_to_binary([0,length(ModeString),ModeString,Bin]).
+    Bin = crypto:block_encrypt(Type, Key, IVec, Bin1),
+    TypeString = atom_to_list(Type),
+    list_to_binary([0,length(TypeString),TypeString,Bin]).
 
 random_bytes(N) ->
     {A,B,C} = now(),
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index aed786727d..da8aecdc8b 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -492,6 +492,16 @@ encrypted_abstr_1(Simple, Target) ->
     ?line {error,beam_lib,{key_missing_or_invalid,"simple.beam",abstract_code}} =
 	beam_lib:chunks("simple.beam", [abstract_code]),
     ?line ok = file:set_cwd(OldCwd),
+
+    %% Test key compatibility by reading a BEAM file produced before
+    %% the update to the new crypto functions.
+    install_crypto_key("an old key"),
+    KeyCompat = filename:join(filename:dirname(Simple),
+			      "key_compatibility"),
+    {ok,{key_compatibility,[Chunk]}} = beam_lib:chunks(KeyCompat,
+						       [abstract_code]),
+    {abstract_code,{raw_abstract_v1,_}} = Chunk,
+
     ok.
 
 
diff --git a/lib/compiler/test/compile_SUITE_data/key_compatibility.beam b/lib/compiler/test/compile_SUITE_data/key_compatibility.beam
new file mode 100644
index 0000000000..28329d2423
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/key_compatibility.beam
diff --git a/lib/compiler/test/compile_SUITE_data/key_compatibility.erl b/lib/compiler/test/compile_SUITE_data/key_compatibility.erl
new file mode 100644
index 0000000000..e2931f1b12
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/key_compatibility.erl
@@ -0,0 +1,8 @@
+-module(key_compatibility).
+-export([main/0]).
+
+%% Compile like this:
+%%  erlc +'{debug_info_key,"an old key"}' key_compatibility.erl
+
+main() ->
+    ok.
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 9d43a1d907..98ebb21f29 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -3087,7 +3087,7 @@ static ERL_NIF_TERM ec_key_to_term_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 	    pub_key = point2term(env, group, public_key, EC_KEY_get_conv_form(obj->key));
     }
 
-    return enif_make_tuple2(env, bn2term(env, priv_key), pub_key);
+    return enif_make_tuple2(env, pub_key, bn2term(env, priv_key));
 #else
     return atom_notsup;
 #endif
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 6e4daee313..ef90f7f0fc 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -60,6 +60,7 @@
     <title>DATA TYPES </title>
     
     <p><code>key_value()  = integer() | binary() </code></p>
+    <p>Always <c>binary()</c> when used as return value</p>
 
     <p><code>rsa_public()  = [key_value()] = [E, N]  </code></p>
     <p> Where E is the public exponent and N is public modulus. </p>
@@ -77,21 +78,14 @@
     <p><code>dss_private() =  [key_value()] = [P, Q, G, X] </code></p>
     <p>Where P, Q and G are the dss parameters and X is the private key.</p>
 
-    <p><code>dss_public() =  [key_value()] =[P, Q, G, Y] </code></p>
-
-    <p><code>srp_public() =  key_value() </code></p>
+    <p><code>srp_public() = key_value() </code></p>
     <p>Where is <c>A</c> or <c>B</c> from <url href="http://srp.stanford.edu/design.html">SRP design</url></p>
 
     <p><code>srp_private() = key_value() </code></p>
     <p>Where is  <c>a</c> or <c>b</c> from <url href="http://srp.stanford.edu/design.html">SRP design</url></p>
 
-    <p><code>srp_params() = {user, [Generator::binary(), Prime::binary(), Version::atom()]} |
-    {host, [Verifier::binary(), Generator::binary(), Prime::binary(), Version::atom()]}
-    |  {user, [DerivedKey::binary(), Prime::binary(), Generator::binary(), Version::atom() | [Scrambler:binary()]]}
-    | {host,[Verifier::binary(), Prime::binary(), Version::atom() | [Scrambler::binary]]} </code></p>
-
     <p>Where Verifier is <c>v</c>, Generator is <c>g</c> and Prime is<c> N</c>, DerivedKey is <c>X</c>, and Scrambler is
-    <c>u</c> (optional will be genrated if not provided) from <url href="http://srp.stanford.edu/design.html">SRP design</url>
+    <c>u</c> (optional will be generated if not provided) from <url href="http://srp.stanford.edu/design.html">SRP design</url>
     Version = '3' |  '6' |  '6a'
     </p>
 
@@ -142,25 +136,23 @@
 
      <p><code>des3_key() = [binary(), binary(), binary()] </code> Each key part is 64 bits (in CBC mode only 8 bits are used)</p>
 
-     <p><code> message_digest_algorithms() =  md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512 </code> md4 is aslo supported for hash_init/1 and hash/2.
+     <p><code>digest_type() =  md5 | sha | sha224 | sha256 | sha384 | sha512</code></p>
+
+     <p><code> hash_algorithms() =  md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512 </code> md4 is also supported for hash_init/1 and hash/2.
      Note that both md4 and md5 are recommended only for compatibility with existing applications.
      </p>
+     <p><code> cipher_algorithms() = des_cbc | des_cfb |  des3_cbc | des3_cbf | des_ede3 |
+     blowfish_cbc | blowfish_cfb64 | aes_cbc128 | aes_cfb128| aes_cbc256 | rc2_cbc | aes_ctr| rc4  </code> </p>
+     <p><code> public_key_algorithms() =   rsa |dss | ecdsa | dh | ecdh </code> </p>
+     
  </section>
 
   <funcs>
-    <func>
-      <name>algorithms() -> [message_digest_algorithms() | md4 | ec]</name>
-      <fsummary>Provide a list of available crypto algorithms.</fsummary>
-      <desc>
-        <p> Can be used to determine if the crypto library has support for elliptic curve (ec) and
-	which message digest algorithms that are supported.</p>
-      </desc>
-    </func>
-
       <func>
       <name>block_encrypt(Type, Key, Ivec, PlainText) -> CipherText</name>
       <fsummary>Encrypt <c>PlainText</c>according to <c>Type</c> block cipher</fsummary>
       <type>
+	<v>Type = block_cipher() </v>
 	<v>Key = block_key() </v>
         <v>PlainText = iodata() </v>
         <v>IVec = CipherText = binary()</v>
@@ -176,6 +168,7 @@
       <name>block_decrypt(Type, Key, Ivec, CipherText) -> PlainText</name>
       <fsummary>Decrypt <c>CipherText</c>according to <c>Type</c> block cipher</fsummary>
       <type>
+	<v>Type = block_cipher() </v>
 	<v>Key = block_key() </v>
         <v>PlainText = iodata() </v>
         <v>IVec = CipherText = binary()</v>
@@ -186,15 +179,31 @@
          </p>
       </desc>
     </func>
+    
+     <func>
+      <name>bytes_to_integer(Bin) -> Integer </name>
+      <fsummary>Convert binary representation, of an integer, to an Erlang integer.</fsummary>
+      <type>
+	<v>Bin = binary() - as returned by crypto functions</v>
+	
+        <v>Integer = integer() </v>
+      </type>
+      <desc>
+        <p>Convert binary representation, of an integer, to an Erlang integer.
+         </p>
+      </desc>
+    </func>
 
     <func>
-      <name>compute_key(Type, OthersPublicKey, MyPrivateKey, Params) -> SharedSecret</name>
+      <name>compute_key(Type, OthersPublicKey, MyKey, Params) -> SharedSecret</name>
       <fsummary>Computes the shared secret</fsummary>
       <type>
 	<v> Type = dh | ecdh | srp </v>
 	<v>OthersPublicKey =  dh_public() | ecdh_public() | srp_public() </v>
-	<v>MyPrivate =  dh_private() | ecdh_private() | srp_private()  </v>
-	<v>Params = dh_params() | edhc_params() | srp_params() </v>
+	<v>MyKey = dh_private() | ecdh_private() | {srp_public(),srp_private()}</v>
+	<v>Params = dh_params() | ecdh_params() | SrpUserParams | SrpHostParams</v>
+	<v>SrpUserParams = {user, [DerivedKey::binary(), Prime::binary(), Generator::binary(), Version::atom() | [Scrambler:binary()]]} </v>
+	<v>SrpHostParams = {host, [Verifier::binary(), Prime::binary(), Version::atom() | [Scrambler::binary]]} </v>
 	<v>SharedSecret = binary()</v>
       </type>
       <desc>
@@ -217,14 +226,17 @@
     </func>
 
    <func>
-      <name>generate_key(Type, Params) -> {PublicKey, PrivateKey} </name>
-      <name>generate_key(Type, Params, PrivateKey) -> {PublicKey, PrivateKey} </name>
+      <name>generate_key(Type, Params) -> {PublicKey, PrivKeyOut} </name>
+      <name>generate_key(Type, Params, PrivKeyIn) -> {PublicKey, PrivKeyOut} </name>
       <fsummary>Generates a public keys of type <c>Type</c></fsummary>
       <type>
 	<v> Type = dh | ecdh | srp </v>
-	<v>Params = dh_params() | edhc_params() | srp_params() </v>
+	<v>Params = dh_params() | ecdh_params() | SrpUserParams | SrpHostParams </v>
+	<v>SrpUserParams = {user, [Generator::binary(), Prime::binary(), Version::atom()]}</v>
+	<v>SrpHostParams = {host, [Verifier::binary(), Generator::binary(), Prime::binary(), Version::atom()]}</v>
 	<v>PublicKey =  dh_public() | ecdh_public() | srp_public() </v>
-	<v>PrivateKey =  dh_private() | ecdh_private() | srp_private() </v>
+	<v>PrivKeyIn = undefined | dh_private() | srp_private() </v>
+	<v>PrivKeyOut =  dh_private() | ecdh_private() | srp_private() </v>
       </type>
       <desc>
 	<p>Generates public keys of type <c>Type</c>.
@@ -407,16 +419,20 @@
     </func>
 
     <func>
-   <name>next_iv(Type, Data) -> </name>
+   <name>next_iv(Type, Data) -> NextIVec</name>
+   <name>next_iv(Type, Data, IVec) -> NextIVec</name>
    <fsummary></fsummary>
    <type>
-     <v>Type = des_cbc | aes_cbc</v>
+     <v>Type = des_cbc | des3_cbc | aes_cbc | des_cfb</v>
      <v>Data = iodata()</v>
+     <v>IVec = NextIVec = binary()</v>
    </type>
    <desc>
      <p>Returns the initialization vector to be used in the next
-     iteration of encrypt/decrypt of type <c>Type</c>. Data is the
-     encrypted data from the previous iteration step.</p>
+     iteration of encrypt/decrypt of type <c>Type</c>. <c>Data</c> is the
+     encrypted data from the previous iteration step. The <c>IVec</c>
+     argument is only needed for <c>des_cfb</c> as the vector used
+     in the previous iteration step.</p>
    </desc>
     </func>
 
@@ -549,10 +565,12 @@
 	signed or it is the hashed value of "plain text" i.e. the
 	digest.</d>
 	<v>DigestType = digest_type()</v>
-	<v>Key = rsa_private_key() | dsa_private_key() | ec_private_key()</v>
+	<v>Key = rsa_private() | dss_private() | [ecdh_private(),ecdh_params()]</v>
       </type>
       <desc>
-	<p> Creates a digital signature.</p>
+	<p>Creates a digital signature.</p>
+	<p>Algorithm <c>dss</c> can only be used together with digest type
+	<c>sha</c>.</p>
 	See also <seealso marker="public_key:public_key#sign/3">public_key:sign/3</seealso>
       </desc>
     </func>
@@ -591,10 +609,9 @@
       <name>stream_init(Type, Key) -> State</name>
       <fsummary></fsummary>
       <type>
-	<v>Type rc4 </v>
+	<v>Type = rc4 </v>
         <v>State = opaque() </v>
         <v>Key = iodata()</v>
-        <v>IVec = binary()</v>
       </type>
       <desc>
         <p>Initializes the state for use in RC4 stream encryption
@@ -607,7 +624,7 @@
       <name>stream_init(Type, Key, IVec) -> State</name>
       <fsummary></fsummary>
       <type>
-	<v>Type aes_ctr </v>
+	<v>Type = aes_ctr </v>
         <v>State = opaque() </v>
         <v>Key = iodata()</v>
         <v>IVec = binary()</v>
@@ -651,6 +668,22 @@
       </desc>
     </func>
 
+   <func>
+      <name>supports() -> AlgorithmList </name>
+      <fsummary>Provide a list of available crypto algorithms.</fsummary>
+      <type>
+      <v> AlgorithmList =  [{hashs, [hash_algorithms()]},
+                            {ciphers, [cipher_algorithms()]},
+			    {public_keys, [public_key_algorithms()]}
+      </v>
+      </type>
+      <desc>
+        <p> Can be used to determine which crypto algorithms that are supported
+	by the underlying OpenSSL library</p>
+      </desc>
+    </func>
+
+    
   <func>
       <name>verify(Algorithm, DigestType, Msg, Signature, Key) -> boolean()</name>
       <fsummary>Verifies a digital signature.</fsummary>
@@ -661,10 +694,13 @@
         or it is the hashed value of "plain text" i.e. the digest.</d>
 	<v>DigestType = digest_type()</v>
 	<v>Signature = binary()</v>
-	<v>Key = rsa_public_key() | dsa_public_key() | ec_public_key()</v>
+	<v>Key = rsa_public() | dss_public() | [ecdh_public(),ecdh_params()]</v>
       </type>
       <desc>
 	<p>Verifies a digital signature</p>
+	<p>Algorithm <c>dss</c> can only be used together with digest type
+	<c>sha</c>.</p>
+
 	See also <seealso marker="public_key:public_key#sign/3">public_key:verify/3</seealso>
       </desc>
     </func>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index f4e157198c..e042545094 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -21,7 +21,7 @@
 
 -module(crypto).
 
--export([start/0, stop/0, info_lib/0, algorithms/0, version/0]).
+-export([start/0, stop/0, info_lib/0, supports/0, version/0, bytes_to_integer/1]).
 -export([hash/2, hash_init/1, hash_update/2, hash_final/1]).
 -export([sign/4, verify/5]).
 -export([generate_key/2, generate_key/3, compute_key/4]).
@@ -33,9 +33,9 @@
 -export([stream_init/2, stream_init/3, stream_encrypt/2, stream_decrypt/2]).
 -export([public_encrypt/4, private_decrypt/4]).
 -export([private_encrypt/4, public_decrypt/4]).
-
 -export([dh_generate_parameters/2, dh_check/1]). %% Testing see
 
+
 %% DEPRECATED
 %% Replaced by hash_*
 -export([md4/1, md4_init/0, md4_update/2, md4_final/1]).
@@ -218,7 +218,7 @@
 		    des_cbc_ivec, des_cfb_ivec,
 		    info,
 		    %%
-		    info_lib, algorithms]).
+		    info_lib, supports]).
 
 -type mpint() :: binary().
 -type rsa_digest_type() :: 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512'.
@@ -226,15 +226,14 @@
 %%-type ecdsa_digest_type() :: 'md5' | 'sha' | 'sha256' | 'sha384' | 'sha512'.
 -type data_or_digest() :: binary() | {digest, binary()}.
 -type crypto_integer() :: binary() | integer().
--type ec_key_res() :: any().		%% nif resource
--type ec_named_curve() :: atom().
--type ec_point() :: crypto_integer().
--type ec_basis() :: {tpbasis, K :: non_neg_integer()} | {ppbasis, K1 :: non_neg_integer(), K2 :: non_neg_integer(), K3 :: non_neg_integer()} | onbasis.
--type ec_field() :: {prime_field, Prime :: integer()} | {characteristic_two_field, M :: integer(), Basis :: ec_basis()}.
--type ec_prime() :: {A :: crypto_integer(), B :: crypto_integer(), Seed :: binary() | none}.
--type ec_curve_spec() :: {Field :: ec_field(), Prime :: ec_prime(), Point :: crypto_integer(), Order :: integer(), CoFactor :: none | integer()}.
--type ec_curve() :: ec_named_curve() | ec_curve_spec().
--type ec_key() :: {Curve :: ec_curve(), PrivKey :: binary() | undefined, PubKey :: ec_point() | undefined}.
+%%-type ec_named_curve() :: atom().
+%%-type ec_point() :: crypto_integer().
+%%-type ec_basis() :: {tpbasis, K :: non_neg_integer()} | {ppbasis, K1 :: non_neg_integer(), K2 :: non_neg_integer(), K3 :: non_neg_integer()} | onbasis.
+%%-type ec_field() :: {prime_field, Prime :: integer()} | {characteristic_two_field, M :: integer(), Basis :: ec_basis()}.
+%%-type ec_prime() :: {A :: crypto_integer(), B :: crypto_integer(), Seed :: binary() | none}.
+%%-type ec_curve_spec() :: {Field :: ec_field(), Prime :: ec_prime(), Point :: crypto_integer(), Order :: integer(), CoFactor :: none | integer()}.
+%%-type ec_curve() :: ec_named_curve() | ec_curve_spec().
+%%-type ec_key() :: {Curve :: ec_curve(), PrivKey :: binary() | undefined, PubKey :: ec_point() | undefined}.
 
 -define(nif_stub,nif_stub_error(?LINE)).
 
@@ -306,6 +305,22 @@ info_lib() -> ?nif_stub.
 
 algorithms() -> ?nif_stub.
 
+supports()->
+    Algs = algorithms(),
+    PubKeyAlgs = 
+	case lists:member(ec, Algs) of
+	    true ->
+		{public_keys, [rsa, dss, ecdsa, dh, srp, ecdh]};
+	    false ->
+		{public_keys, [rsa, dss, dh, srp]}
+	end,
+    [{hashs, Algs -- [ec]},
+     {ciphers, [des_cbc, des_cfb,  des3_cbc, des3_cbf, des_ede3, blowfish_cbc,
+		blowfish_cfb64, blowfish_ofb64, blowfish_ecb, aes_cbc128, aes_cfb128, aes_cbc256, rc2_cbc, aes_ctr, rc4
+	       ]},
+     PubKeyAlgs
+    ].
+
 %% Crypto app version history:
 %% (no version): Driver implementation
 %% 2.0         : NIF implementation, requires OTP R14
@@ -575,7 +590,7 @@ hmac(sha384, Key, Data) -> sha384_mac(Key, Data);
 hmac(sha512, Key, Data) -> sha512_mac(Key, Data).
 
 hmac(md5, Key, Data, Size)    -> md5_mac_n(Key, Data, Size);
-hmac(sha, Key, Data, Size)    -> sha_mac(Key, Data, Size);
+hmac(sha, Key, Data, Size)    -> sha_mac_n(Key, Data, Size);
 hmac(sha224, Key, Data, Size) -> sha224_mac(Key, Data, Size);
 hmac(sha256, Key, Data, Size) -> sha256_mac(Key, Data, Size);
 hmac(sha384, Key, Data, Size) -> sha384_mac(Key, Data, Size);
@@ -731,7 +746,7 @@ block_decrypt(blowfish_cbc, Key, Ivec, Data) ->
     blowfish_cbc_decrypt(Key, Ivec, Data);
 block_decrypt(blowfish_cfb64, Key, Ivec, Data) ->
     blowfish_cfb64_decrypt(Key, Ivec, Data);
-block_decrypt(blowfish_ofb, Key, Ivec, Data) ->
+block_decrypt(blowfish_ofb64, Key, Ivec, Data) ->
     blowfish_ofb64_decrypt(Key, Ivec, Data);
 block_decrypt(aes_cbc128, Key, Ivec, Data) ->
     aes_cbc_128_decrypt(Key, Ivec, Data);
@@ -756,24 +771,28 @@ block_decrypt(des_ecb, Key, Data) ->
 block_decrypt(blowfish_ecb, Key, Data) ->
     blowfish_ecb_decrypt(Key, Data).
 
--spec next_iv(des_cbc | aes_cbc, Data::iodata()) -> binary().
+-spec next_iv(des_cbc | des3_cbc | aes_cbc, Data::iodata()) -> binary().
 
 next_iv(des_cbc, Data) ->
     des_cbc_ivec(Data);
+next_iv(des3_cbc, Data) ->
+    des_cbc_ivec(Data);
 next_iv(aes_cbc, Data) ->
     aes_cbc_ivec(Data).
 
--spec next_iv(des_cbf, Ivec::binary(), Data::iodata()) -> binary().
+-spec next_iv(des_cfb, Data::iodata(), Ivec::binary()) -> binary().
 
-next_iv(des_cbf, Ivec, Data) ->
-    des_cfb_ivec(Ivec, Data).
+next_iv(des_cfb, Data, Ivec) ->
+    des_cfb_ivec(Ivec, Data);
+next_iv(Type, Data, _Ivec) ->
+    next_iv(Type, Data).
 
 stream_init(aes_ctr, Key, Ivec) ->
     {aes_ctr, aes_ctr_stream_init(Key, Ivec)}.
 stream_init(rc4, Key) ->
     {rc4, rc4_set_key(Key)}.
-stream_encrypt({aes_ctr, State}, Data) ->
-    {State, Cipher} = aes_ctr_stream_encrypt(State, Data),
+stream_encrypt({aes_ctr, State0}, Data) ->
+    {State, Cipher} = aes_ctr_stream_encrypt(State0, Data),
     {{aes_ctr, State}, Cipher};
 stream_encrypt({rc4, State0}, Data) ->
     {State, Cipher} = rc4_encrypt_with_state(State0, Data),
@@ -1068,7 +1087,7 @@ verify(rsa, Type, DataOrDigest, Signature, Key) ->
 	Bool -> Bool
     end;
 verify(ecdsa, Type, DataOrDigest, Signature, [Key, Curve]) ->
-    case ecdsa_verify_nif(Type, DataOrDigest, Signature, term_to_ec_key({Curve, undefined, Key})) of
+    case ecdsa_verify_nif(Type, DataOrDigest, Signature, term_to_ec_key(Curve, undefined, Key)) of
 	notsup -> erlang:error(notsup);
 	Bool -> Bool
     end.
@@ -1135,7 +1154,7 @@ sign(dss, Type, DataOrDigest, Key) ->
 	Sign -> Sign
     end;
 sign(ecdsa, Type, DataOrDigest, [Key, Curve]) ->
-    case ecdsa_sign_nif(Type, DataOrDigest, term_to_ec_key({Curve, Key, undefined})) of
+    case ecdsa_sign_nif(Type, DataOrDigest, term_to_ec_key(Curve, Key, undefined)) of
 	error -> erlang:error(badkey, [Type,DataOrDigest,Key]);
 	Sign -> Sign
     end.
@@ -1397,13 +1416,14 @@ generate_key(Type, Params) ->
     generate_key(Type, Params, undefined).
 
 generate_key(dh, DHParameters, PrivateKey) ->
-    dh_generate_key_nif(PrivateKey,  map_ensure_int_as_bin(DHParameters), 0);
+    dh_generate_key_nif(ensure_int_as_bin(PrivateKey),
+			map_ensure_int_as_bin(DHParameters), 0);
 
 generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, PrivArg)
   when is_binary(Verifier), is_binary(Generator), is_binary(Prime), is_atom(Version) ->
     Private = case PrivArg of
 		  undefined -> random_bytes(32);
-		  _ -> PrivArg
+		  _ -> ensure_int_as_bin(PrivArg)
 	      end,
     host_srp_gen_key(Private, Verifier, Generator, Prime, Version);
 
@@ -1416,14 +1436,16 @@ generate_key(srp, {user, [Generator, Prime, Version]}, PrivateArg)
     user_srp_gen_key(Private, Generator, Prime);
 
 generate_key(ecdh, Curve, undefined) ->
-    ec_key_to_term(ec_key_generate(Curve)).
+    ec_key_to_term_nif(ec_key_generate(Curve)).
 
 
 ec_key_generate(_Key) -> ?nif_stub.
 
 
 compute_key(dh, OthersPublicKey, MyPrivateKey, DHParameters) ->
-    case dh_compute_key_nif(OthersPublicKey,MyPrivateKey, map_ensure_int_as_bin(DHParameters)) of
+    case dh_compute_key_nif(ensure_int_as_bin(OthersPublicKey),
+			    ensure_int_as_bin(MyPrivateKey),
+			    map_ensure_int_as_bin(DHParameters)) of
 	error -> erlang:error(computation_failed,
 			      [OthersPublicKey,MyPrivateKey,DHParameters]);
 	Ret -> Ret
@@ -1433,34 +1455,33 @@ compute_key(srp, HostPublic, {UserPublic, UserPrivate},
 	    {user, [DerivedKey, Prime, Generator, Version | ScramblerArg]}) when
       is_binary(Prime),
       is_binary(Generator),
-      is_binary(UserPublic),
-      is_binary(UserPrivate),
-      is_binary(HostPublic),
       is_atom(Version) ->
+    HostPubBin = ensure_int_as_bin(HostPublic),
     Multiplier = srp_multiplier(Version, Generator, Prime),
     Scrambler = case ScramblerArg of
-		    [] -> srp_scrambler(Version, UserPublic, HostPublic, Prime);
+		    [] -> srp_scrambler(Version, ensure_int_as_bin(UserPublic),
+					HostPubBin, Prime);
 		    [S] -> S
 		end,
-    srp_user_secret_nif(UserPrivate, Scrambler, HostPublic, Multiplier,
-			  Generator, DerivedKey, Prime);
+    srp_user_secret_nif(ensure_int_as_bin(UserPrivate), Scrambler, HostPubBin,
+			Multiplier, Generator, DerivedKey, Prime);
 
 compute_key(srp, UserPublic, {HostPublic, HostPrivate},
 	    {host,[Verifier, Prime, Version | ScramblerArg]}) when
       is_binary(Verifier),
       is_binary(Prime),
-      is_binary(UserPublic),
-      is_binary(HostPublic),
-      is_binary(HostPrivate),
       is_atom(Version) ->
+    UserPubBin = ensure_int_as_bin(UserPublic),
     Scrambler = case ScramblerArg of
-		    [] -> srp_scrambler(Version, UserPublic, HostPublic, Prime);
+		    [] -> srp_scrambler(Version, UserPubBin, ensure_int_as_bin(HostPublic), Prime);
 		    [S] -> S
 		end,
-    srp_host_secret_nif(Verifier, HostPrivate, Scrambler, UserPublic, Prime);
+    srp_host_secret_nif(Verifier, ensure_int_as_bin(HostPrivate), Scrambler,
+			UserPubBin, Prime);
 
 compute_key(ecdh, Others, My, Curve) ->
-    ecdh_compute_key_nif(Others, term_to_ec_key({Curve,My,undefined})).
+    ecdh_compute_key_nif(ensure_int_as_bin(Others),
+			 term_to_ec_key(Curve,My,undefined)).
 
 ecdh_compute_key_nif(_Others, _My) -> ?nif_stub.
 
@@ -1468,14 +1489,6 @@ ecdh_compute_key_nif(_Others, _My) -> ?nif_stub.
 %%
 %% EC
 %%
-ec_key_to_term(Key) ->
-    case ec_key_to_term_nif(Key) of
-        {PrivKey, PubKey} ->
-            {bin_to_int(PrivKey), PubKey};
-        _ ->
-            erlang:error(conversion_failed)
-    end.
-
 ec_key_to_term_nif(_Key) -> ?nif_stub.
 
 term_to_nif_prime({prime_field, Prime}) ->
@@ -1490,11 +1503,10 @@ term_to_nif_curve_parameters(Curve) when is_atom(Curve) ->
     %% named curve
     Curve.
 
--spec term_to_ec_key(ec_key()) -> ec_key_res().
-term_to_ec_key({Curve, undefined, PubKey}) ->
-    term_to_ec_key_nif(term_to_nif_curve_parameters(Curve), undefined, PubKey);
-term_to_ec_key({Curve, PrivKey, PubKey}) ->
-    term_to_ec_key_nif(term_to_nif_curve_parameters(Curve), int_to_bin(PrivKey), PubKey).
+term_to_ec_key(Curve, PrivKey, PubKey) ->
+    term_to_ec_key_nif(term_to_nif_curve_parameters(Curve),
+		       ensure_int_as_bin(PrivKey),
+		       ensure_int_as_bin(PubKey)).
 
 term_to_ec_key_nif(_Curve, _PrivKey, _PubKey) -> ?nif_stub.
 
@@ -1598,6 +1610,8 @@ int_to_bin_neg(-1, Ds=[MSB|_]) when MSB >= 16#80 ->
 int_to_bin_neg(X,Ds) ->
     int_to_bin_neg(X bsr 8, [(X band 255)|Ds]).
 
+bytes_to_integer(Bin) ->
+    bin_to_int(Bin).
 
 bin_to_int(Bin) when is_binary(Bin) ->
     Bits = bit_size(Bin),
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index ec8136b455..07e5c1b754 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -7,7 +7,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 MODULES = \
 	blowfish_SUITE \
-	crypto_SUITE
+	crypto_SUITE \
+	old_crypto_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index eddb6b83f9..c007ecac86 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -18,106 +18,104 @@
 %%
 -module(crypto_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
-
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, 
-	 init_per_testcase/2,
-	 end_per_testcase/2,
-	 info/1,
-	 link_test/1,
-	 md5/1,
-	 md5_update/1,
-	 md4/1,
-	 md4_update/1,
-	 sha/1,
-	 sha_update/1,
-         hmac_update_sha/1,
-         hmac_update_sha_n/1,
-         hmac_update_sha256/1,
-         hmac_update_sha512/1,
-         hmac_update_md5/1,
-         hmac_update_md5_io/1,
-         hmac_update_md5_n/1,
-         hmac_rfc2202/1,
-	 hmac_rfc4231_sha224/1,
-	 hmac_rfc4231_sha256/1,
-	 hmac_rfc4231_sha384/1,
-	 hmac_rfc4231_sha512/1,
-   ripemd160/1,
-   ripemd160_update/1,
-	 sha256/1,
-	 sha256_update/1,
-	 sha512/1,
-	 sha512_update/1,
-	 md5_mac/1,
-	 md5_mac_io/1,
-	 des_cbc/1,
-	 des_cbc_iter/1,
-	 des_cfb/1,
-	 des_cfb_iter/1,
-	 des_ecb/1,
-	 des3_cbc/1,
-	 des3_cfb/1,
-	 rc2_cbc/1,
-	 aes_cfb/1,
-	 aes_cbc/1,
-	 aes_cbc_iter/1,
-	 aes_ctr/1,
-	 aes_ctr_stream/1,
-	 mod_exp_test/1,
-	 rand_uniform_test/1,
-	 strong_rand_test/1,
-	 rsa_verify_test/1,
-	 dsa_verify_test/1,
-	 rsa_sign_test/1,
-	 rsa_sign_hash_test/1,
-	 dsa_sign_test/1,	 
-	 dsa_sign_hash_test/1,
-	 rsa_encrypt_decrypt/1,
-	 dh/1,
-	 srp3/1, srp6/1, srp6a/1,
-	 ec/1,
-	 exor_test/1,
-	 rc4_test/1,
-	 rc4_stream_test/1,
-	 blowfish_cfb64/1,
-	 smp/1]).
-
--export([hexstr2bin/1]).
+-include_lib("common_test/include/ct.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [link_test, {group, info}].
-
-groups() ->
-    [{info, [sequence],[info, {group, rest}]},
-     {rest, [],
-      [md5, md5_update, md4, md4_update, md5_mac,
-       md5_mac_io, ripemd160, ripemd160_update, sha, sha_update,
-       sha256, sha256_update, sha512, sha512_update,
-       hmac_update_sha, hmac_update_sha_n, hmac_update_sha256, hmac_update_sha512,
-       hmac_update_md5_n, hmac_update_md5_io, hmac_update_md5,
-       hmac_rfc2202, hmac_rfc4231_sha224, hmac_rfc4231_sha256,
-       hmac_rfc4231_sha384, hmac_rfc4231_sha512,
-       des_cbc, aes_cfb, aes_cbc,
-       des_cfb, des_cfb_iter, des3_cbc, des3_cfb, rc2_cbc,
-       aes_cbc_iter, aes_ctr, aes_ctr_stream, des_cbc_iter, des_ecb,
-       rand_uniform_test, strong_rand_test,
-       rsa_verify_test, dsa_verify_test, rsa_sign_test,
-       rsa_sign_hash_test, dsa_sign_test, dsa_sign_hash_test,
-       rsa_encrypt_decrypt, dh, srp3, srp6, srp6a, ec, exor_test,
-       rc4_test, rc4_stream_test, mod_exp_test, blowfish_cfb64,
-       smp]}].
-
+    [app,
+     {group, md4},
+     {group, md5},
+     {group, ripemd160},
+     {group, sha},
+     {group, sha224},
+     {group, sha256},
+     {group, sha384},
+     {group, sha512},
+     {group, rsa},
+     {group, dss},
+     {group, ecdsa},
+     {group, dh},
+     {group, ecdh},
+     {group, srp},
+     {group, des_cbc},
+     {group, des_cfb},
+     {group, des3_cbc},
+     {group, des3_cbf},
+     %%{group, des_ede3},
+     {group, blowfish_cbc},
+     {group, blowfish_ecb},
+     {group, blowfish_cfb64},
+     {group, blowfish_ofb64},
+     {group, aes_cbc128},
+     {group, aes_cfb128},
+     {group, aes_cbc256},
+     {group, rc2_cbc},
+     {group, rc4}, 
+     {group, aes_ctr},
+     mod_pow,
+     exor
+    ].
+
+groups() -> 
+    [{md4, [], [hash]},
+     {md5, [], [hash, hmac]},
+     {ripemd160, [], [hash]},
+     {sha, [], [hash, hmac]},
+     {sha224, [], [hash, hmac]},
+     {sha256, [], [hash, hmac]},
+     {sha384, [], [hash, hmac]},
+     {sha512, [], [hash, hmac]},
+     {rsa, [], [sign_verify, 
+		public_encrypt
+	       ]},
+     {dss, [], [sign_verify]},
+     {ecdsa, [], [sign_verify]},
+     {dh, [], [generate_compute]},
+     {ecdh, [], [compute]},
+     {srp, [], [generate_compute]},
+     {des_cbc, [], [block]},
+     {des_cfb, [], [block]},
+     {des3_cbc,[], [block]},
+     {des3_cbf,[], [block]},
+     {rc2_cbc,[], [block]},
+     {aes_cbc128,[], [block]},
+     {aes_cfb128,[], [block]},
+     {aes_cbc256,[], [block]},
+     {blowfish_cbc, [], [block]},
+     {blowfish_ecb, [], [block]},
+     {blowfish_cfb64, [], [block]},
+     {blowfish_ofb64,[], [block]},
+     {rc4, [], [stream]}, 
+     {aes_ctr, [], [stream]}
+    ].
+
+%%-------------------------------------------------------------------
 init_per_suite(Config) ->
-    Config.
+    try crypto:start() of
+	ok ->
+	    Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
 
 end_per_suite(_Config) ->
-    ok.
+    application:stop(crypto).
 
-init_per_group(_GroupName, Config) ->
-    Config.
+%%-------------------------------------------------------------------
+init_per_group(GroupName, Config) ->
+    case is_supported(GroupName) of
+	true ->
+	    group_config(GroupName, Config);
+	false ->
+	    {skip, "Group not supported"}
+    end.
 
 end_per_group(_GroupName, Config) ->
     Config.
@@ -125,1821 +123,1098 @@ end_per_group(_GroupName, Config) ->
 init_per_testcase(info, Config) ->
     Config;
 init_per_testcase(_Name,Config) ->
-    io:format("init_per_testcase\n"),
-    ?line crypto:start(),
     Config.
 
 end_per_testcase(info, Config) ->
     Config;
 end_per_testcase(_Name,Config) ->
-    io:format("end_per_testcase\n"),
-    ?line crypto:stop(),
     Config.
 
-%%
-%%
-link_test(doc) ->
-    ["Test that the library is statically linked to libcrypto.a."];
-link_test(suite) ->
-    [];
-link_test(Config) when is_list(Config) ->
-    ?line case os:type() of
-	      {unix,darwin} -> {skipped,"Darwin cannot link statically"};
-	      {unix,_} -> link_test_1();
-	      _ -> {skip,"Only runs on Unix"}
-	  end.
-
-link_test_1() ->    
-    ?line CryptoPriv = code:priv_dir(crypto),
-    ?line Wc = filename:join([CryptoPriv,"lib","crypto.*"]),
-    ?line case filelib:wildcard(Wc) of
-	      [] -> {skip,"Didn't find the crypto driver"};
-	      [Drv] -> link_test_2(Drv)
-	  end.
-
-link_test_2(Drv) ->
-    case ldd_program() of
-	none ->
-	    {skip,"No ldd-like program found"};
-	Ldd ->
-	    Cmd = Ldd ++ " " ++ Drv,
-	    Libs = os:cmd(Cmd),
-	    io:format("~p\n", [Libs]),
-	    case string:str(Libs, "libcrypto") of
-		0 -> 
-		    case ?t:is_commercial() of
-			true ->
-			    ?t:fail({libcrypto,statically_linked});
-			false ->
-			    {comment,"Statically linked (OK for open-source platform)"}
-		    end;
-		_ ->
-		    ok
-	    end
-    end.
-
-ldd_program() ->
-    case os:find_executable("ldd") of
-	false ->
-	    case os:type() of
-		{unix,darwin} ->
-		    case os:find_executable("otool") of
-			false -> none;
-			Otool -> Otool ++ " -L"
-		    end
-	    end;
- 	Ldd when is_list(Ldd) -> Ldd
-    end.
-
-
-
-info(doc) ->
-    ["Call the info function."];
-info(suite) ->
-    [];
-info(Config) when is_list(Config) ->
-    case {code:lib_dir(crypto),?t:is_commercial()} of
-	{{error,bad_name},false} ->
-	    {skip,"Missing crypto application"};
-	{_,_} ->
-	    ?line crypto:start(),
-	    ?line Info = crypto:info(),
-	    ?line Exports = lists:usort([F || {F,_} <- crypto:module_info(exports)]),
-	    ?line [] = Info -- Exports,
-	    ?line NotInInfo = Exports -- Info,
-	    io:format("NotInInfo = ~p\n", [NotInInfo]),
-	    %% BlackList = lists:sort([des_ede3_cbc_decrypt, des_ede3_cbc_encrypt,
-	    %% 			    dh_check, dh_generate_parameters,
-	    %% 			    module_info, start, stop, version]),
-	    %% ?line BlackList = NotInInfo,
-
-	    ?line InfoLib = crypto:info_lib(),
-	    ?line [_|_] = InfoLib,
-	    F = fun([{Name,VerN,VerS}|T],Me) ->
-			?line true = is_binary(Name),
-			?line true = is_integer(VerN),
-			?line true = is_binary(VerS),
-			Me(T,Me);
-		   ([],_) ->
-			ok
-		end,
-	    ?line F(InfoLib,F),
-	    ?line crypto:stop()
-     end.
-
-%%
-%%
-md5(doc) ->
-    ["Generate MD5 message digests and check the result. Examples are "
-     "from RFC-1321."];
-md5(suite) ->
-    [];
-md5(Config) when is_list(Config) ->
-    ?line m(crypto:md5(""), 
-		hexstr2bin("d41d8cd98f00b204e9800998ecf8427e")),
-    ?line m(crypto:md5("a"), 
-		hexstr2bin("0cc175b9c0f1b6a831c399e269772661")),
-    ?line m(crypto:md5("abc"), 
-		hexstr2bin("900150983cd24fb0d6963f7d28e17f72")),
-    ?line m(crypto:md5("message digest"),
-		hexstr2bin("f96b697d7cb7938d525a2f31aaf161d0")),
-    ?line m(crypto:md5("abcdefghijklmnopqrstuvwxyz"),
-	    hexstr2bin("c3fcd3d76192e4007dfb496cca67e13b")),
-    ?line m(crypto:md5("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-		     "0123456789"),  
-	    hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f")),
-    ?line m(crypto:md5("12345678901234567890123456789012345678901234567890"
-		     "123456789012345678901234567890"),
-	    hexstr2bin("57edf4a22be3c955ac49da2e2107b67a")).
-
-%%
-%%
-md5_update(doc) ->
-    ["Generate MD5 message using md5_init, md5_update, and md5_final, and"
-     "check the result. Examples are from RFC-1321."];
-md5_update(suite) ->
-    [];
-md5_update(Config) when is_list(Config) ->
-    ?line Ctx = crypto:md5_init(),
-    ?line Ctx1 = crypto:md5_update(Ctx, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-    ?line Ctx2 = crypto:md5_update(Ctx1, "abcdefghijklmnopqrstuvwxyz"
-				   "0123456789"),
-    ?line m(crypto:md5_final(Ctx2),  
-	    hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f")).
-
-%%
-%%
-md4(doc) ->
-    ["Generate MD4 message digests and check the result. Examples are "
-     "from RFC-1321."];
-md4(suite) ->
-    [];
-md4(Config) when is_list(Config) ->
-    ?line m(crypto:md4(""), 
-	    hexstr2bin("31d6cfe0d16ae931b73c59d7e0c089c0")),
-    ?line m(crypto:md4("a"), 
-	    hexstr2bin("bde52cb31de33e46245e05fbdbd6fb24")),
-    ?line m(crypto:md4("abc"), 
-	    hexstr2bin("a448017aaf21d8525fc10ae87aa6729d")),
-    ?line m(crypto:md4("message digest"),
-	    hexstr2bin("d9130a8164549fe818874806e1c7014b")),
-    ?line m(crypto:md4("abcdefghijklmnopqrstuvwxyz"),
-	    hexstr2bin("d79e1c308aa5bbcdeea8ed63df412da9")),
-    ?line m(crypto:md4("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-		       "0123456789"),  
-	    hexstr2bin("043f8582f241db351ce627e153e7f0e4")),
-    ?line m(crypto:md4("12345678901234567890123456789012345678901234567890"
-		       "123456789012345678901234567890"),
-	    hexstr2bin("e33b4ddc9c38f2199c3e7b164fcc0536")).
-
-%%
-%%
-md4_update(doc) ->
-    ["Generate MD5 message using md5_init, md5_update, and md5_final, and"
-     "check the result. Examples are from RFC-1321."];
-md4_update(suite) ->
-    [];
-md4_update(Config) when is_list(Config) ->
-    ?line Ctx = crypto:md4_init(),
-    ?line Ctx1 = crypto:md4_update(Ctx, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-    ?line Ctx2 = crypto:md4_update(Ctx1, "abcdefghijklmnopqrstuvwxyz"
-				   "0123456789"),
-    ?line m(crypto:md4_final(Ctx2),  
-	    hexstr2bin("043f8582f241db351ce627e153e7f0e4")).
-
-%%
-%%
-sha(doc) ->
-    ["Generate SHA message digests and check the result. Examples are "
-     "from FIPS-180-1."];
-sha(suite) ->
-    [];
-sha(Config) when is_list(Config) ->
-    ?line m(crypto:sha("abc"),
-	     hexstr2bin("A9993E364706816ABA3E25717850C26C9CD0D89D")),
-    ?line m(crypto:sha("abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
-		       "nlmnomnopnopq"), 
-		hexstr2bin("84983E441C3BD26EBAAE4AA1F95129E5E54670F1")).
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+app() ->
+    [{doc, "Test that the crypto app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(crypto).
+%%--------------------------------------------------------------------
+hash() ->
+    [{doc, "Test all different hash functions"}].
+hash(Config) when is_list(Config) ->
+    {Type, Msgs, Digests} = proplists:get_value(hash, Config),
+    [LongMsg | _] = lists:reverse(Msgs),
+    Inc = iolistify(LongMsg),
+    [IncrDigest | _] = lists:reverse(Digests),
+    hash(Type, Msgs, Digests),
+    hash(Type, lists:map(fun iolistify/1, Msgs), Digests),
+    hash_increment(Type, Inc, IncrDigest).
+%%-------------------------------------------------------------------- 
+hmac() ->
+     [{doc, "Test all different hmac functions"}].
+hmac(Config) when is_list(Config) ->
+    {Type, Keys, Data, Expected} = proplists:get_value(hmac, Config),
+    hmac(Type, Keys, Data, Expected),
+    hmac(Type, lists:map(fun iolistify/1, Keys), lists:map(fun iolistify/1, Data), Expected),
+    hmac_increment(Type).
+%%--------------------------------------------------------------------
+block() ->
+     [{doc, "Test block ciphers"}].
+block(Config) when is_list(Config) ->
+    Blocks = proplists:get_value(block, Config),
+    lists:foreach(fun block_cipher/1, Blocks),
+    lists:foreach(fun block_cipher/1, block_iolistify(Blocks)),
+    lists:foreach(fun block_cipher_increment/1, block_iolistify(Blocks)).
+
+%%--------------------------------------------------------------------
+stream() ->
+      [{doc, "Test stream ciphers"}].
+stream(Config) when is_list(Config) ->
+    Streams = proplists:get_value(stream, Config),
+    lists:foreach(fun stream_cipher/1, Streams),
+    lists:foreach(fun stream_cipher/1, stream_iolistify(Streams)),
+    lists:foreach(fun stream_cipher_incment/1, stream_iolistify(Streams)).
+
+%%-------------------------------------------------------------------- 
+sign_verify() ->
+     [{doc, "Sign/verify digital signatures"}].
+sign_verify(Config) when is_list(Config) ->
+    SignVerify = proplists:get_value(sign_verify, Config),
+    lists:foreach(fun do_sign_verify/1, SignVerify).
+
+%%-------------------------------------------------------------------- 
+public_encrypt() ->
+     [{doc, "Test public_encrypt/decrypt and private_encrypt/decrypt functions. "}].
+public_encrypt(Config) when is_list(Config) ->
+    Params = proplists:get_value(pub_priv_encrypt, Config),
+    lists:foreach(fun do_public_encrypt/1, Params),
+    lists:foreach(fun do_private_encrypt/1, Params).
+
+%%--------------------------------------------------------------------
+generate_compute() ->
+     [{doc, " Test crypto:genarate_key and crypto:compute_key"}].
+generate_compute(Config) when is_list(Config) ->
+    GenCom = proplists:get_value(generate_compute, Config),
+    lists:foreach(fun do_generate_compute/1, GenCom).
+%%--------------------------------------------------------------------
+compute() ->
+     [{doc, " Test crypto:compute_key"}].
+compute(Config) when is_list(Config) ->
+    Gen = proplists:get_value(compute, Config),
+    lists:foreach(fun do_compute/1, Gen).
+%%--------------------------------------------------------------------
+mod_pow() ->
+    [{doc, "mod_pow testing (A ^ M % P with bignums)"}].
+mod_pow(Config) when is_list(Config) ->
+    mod_pow_aux_test(2, 5, 10, 8).
+%%--------------------------------------------------------------------
+exor() ->
+    [{doc, "Test the exor function"}].
+exor(Config) when is_list(Config) ->
+    B = <<1, 2, 3, 4, 5, 6, 7, 8, 9, 10>>,
+    Z1 = zero_bin(B),
+    Z1 = crypto:exor(B, B),
+    B1 = crypto:rand_bytes(100),
+    B2 = crypto:rand_bytes(100),
+    Z2 = zero_bin(B1),
+    Z2 = crypto:exor(B1, B1),
+    Z2 = crypto:exor(B2, B2),
+    R = xor_bytes(B1, B2),
+    R = crypto:exor(B1, B2).
 
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
 
-%%
-hmac_update_sha_n(doc) ->
-    ["Request a larger-than-allowed SHA1 HMAC using hmac_init, hmac_update, and hmac_final_n. "
-     "Expected values for examples are generated using crypto:sha_mac." ];
-hmac_update_sha_n(suite) ->
-    [];
-hmac_update_sha_n(Config) when is_list(Config) ->
-    ?line Key = hexstr2bin("00010203101112132021222330313233"
-                           "04050607141516172425262734353637"
-                           "08090a0b18191a1b28292a2b38393a3b"
-                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
-    ?line Data = "Sampl",
-    ?line Data2 = "e #1",
-    ?line Ctx = crypto:hmac_init(sha, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
-    ?line Mac = crypto:hmac_final_n(Ctx3, 1024),
-    ?line Exp = crypto:sha_mac(Key, lists:flatten([Data, Data2])),
-    ?line m(Exp, Mac),
-    ?line m(size(Exp), size(Mac)).
-
-
-hmac_update_sha(doc) ->
-    ["Generate an SHA1 HMAC using hmac_init, hmac_update, and hmac_final. "
-     "Expected values for examples are generated using crypto:sha_mac." ];
-hmac_update_sha(suite) ->
-    [];
-hmac_update_sha(Config) when is_list(Config) ->
-    ?line Key = hexstr2bin("00010203101112132021222330313233"
-                           "04050607141516172425262734353637"
-                           "08090a0b18191a1b28292a2b38393a3b"
-                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
-    ?line Data = "Sampl",
-    ?line Data2 = "e #1",
-    ?line Ctx = crypto:hmac_init(sha, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
-    ?line Mac = crypto:hmac_final(Ctx3),
-    ?line Exp = crypto:hmac(sha, Key, lists:flatten([Data, Data2])),
-    ?line m(Exp, Mac).
-
-hmac_update_sha256(doc) ->
-    ["Generate an SHA256 HMAC using hmac_init, hmac_update, and hmac_final. "
-     "Expected values for examples are generated using crypto:sha256_mac." ];
-hmac_update_sha256(suite) ->
-    [];
-hmac_update_sha256(Config) when is_list(Config) ->
-    if_supported(sha256, fun() -> hmac_update_sha256_do() end).
-
-hmac_update_sha256_do() ->
-    ?line Key = hexstr2bin("00010203101112132021222330313233"
-                           "04050607141516172425262734353637"
-                           "08090a0b18191a1b28292a2b38393a3b"
-                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
-    ?line Data = "Sampl",
-    ?line Data2 = "e #1",
-    ?line Ctx = crypto:hmac_init(sha256, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
-    ?line Mac = crypto:hmac_final(Ctx3),
-    ?line Exp = crypto:hmac(sha256, Key, lists:flatten([Data, Data2])),
-    ?line m(Exp, Mac).
-
-hmac_update_sha512(doc) ->
-    ["Generate an SHA512 HMAC using hmac_init, hmac_update, and hmac_final. "
-     "Expected values for examples are generated using crypto:sha512_mac." ];
-hmac_update_sha512(suite) ->
-    [];
-hmac_update_sha512(Config) when is_list(Config) ->
-    if_supported(sha512, fun() -> hmac_update_sha512_do() end).
-
-hmac_update_sha512_do() ->
-    ?line Key = hexstr2bin("00010203101112132021222330313233"
-                           "04050607141516172425262734353637"
-                           "08090a0b18191a1b28292a2b38393a3b"
-                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
-    ?line Data = "Sampl",
-    ?line Data2 = "e #1",
-    ?line Ctx = crypto:hmac_init(sha512, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
-    ?line Mac = crypto:hmac_final(Ctx3),
-    ?line Exp = crypto:hmac(sha512, Key, lists:flatten([Data, Data2])),
-    ?line m(Exp, Mac).
-    
-hmac_update_md5(doc) ->
-    ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
-     "Expected values for examples are generated using crypto:md5_mac." ];
-hmac_update_md5(suite) ->
-    [];
-hmac_update_md5(Config) when is_list(Config) ->
-    % ?line Key2 = ["A fine speach", "by a fine man!"],
-    Key2 = "A fine speach by a fine man!",
-    ?line Long1 = "Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in liberty, and dedicated to the proposition that all men are created equal.",
-    ?line Long2 = "Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.",
-    ?line Long3 = "But, in a larger sense, we can not dedicate, we can not consecrate, we can not hallow this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us-that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion that we here highly resolve that these dead shall not have died in vain-that this nation, under God, shall have a new birth of freedom-and that government of the people, by the people, for the people, shall not perish from the earth.",
-    ?line CtxA = crypto:hmac_init(md5, Key2),
-    ?line CtxB = crypto:hmac_update(CtxA, Long1),
-    ?line CtxC = crypto:hmac_update(CtxB, Long2),
-    ?line CtxD = crypto:hmac_update(CtxC, Long3),
-    ?line Mac2 = crypto:hmac_final(CtxD),
-    ?line Exp2 = crypto:md5_mac(Key2, lists:flatten([Long1, Long2, Long3])), 
-    ?line m(Exp2, Mac2).
-
-hmac_rfc2202(doc) ->
-    ["Generate an HMAC using hmac, md5_mac, and sha_mac."
-     "Test vectors are taken from RFC-2202."];
-hmac_rfc2202(suite) ->
-    [];
-hmac_rfc2202(Config) when is_list(Config) ->
-    hmac_rfc2202_md5(),
-    hmac_rfc2202_sha().
-
-hmac_rfc2202_md5() ->
-    %% Test case 1
-    Case1Key = binary:copy(<<16#0b>>, 16),
-    Case1Data = <<"Hi There">>,
-    Case1Exp = hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d"),
-
-    ?line Case1Mac_1 = crypto:md5_mac(Case1Key, Case1Data),
-    ?line Case1Mac_2 = crypto:hmac(md5, Case1Key, Case1Data),
-    ?line m(Case1Exp, Case1Mac_1),
-    ?line m(Case1Exp, Case1Mac_2),
-
-    %% Test case 2
-    Case2Key = <<"Jefe">>,
-    Case2Data = <<"what do ya want for nothing?">>,
-    Case2Exp = hexstr2bin("750c783e6ab0b503eaa86e310a5db738"),
-
-    ?line Case2Mac_1 = crypto:md5_mac(Case2Key, Case2Data),
-    ?line Case2Mac_2 = crypto:hmac(md5, Case2Key, Case2Data),
-    ?line m(Case2Exp, Case2Mac_1),
-    ?line m(Case2Exp, Case2Mac_2),
-
-    %% Test case 3
-    Case3Key = binary:copy(<<16#aa>>, 16),
-    Case3Data = binary:copy(<<16#dd>>, 50),
-    Case3Exp = hexstr2bin("56be34521d144c88dbb8c733f0e8b3f6"),
-
-    ?line Case3Mac_1 = crypto:md5_mac(Case3Key, Case3Data),
-    ?line Case3Mac_2 = crypto:hmac(md5, Case3Key, Case3Data),
-    ?line m(Case3Exp, Case3Mac_1),
-    ?line m(Case3Exp, Case3Mac_2),
-
-    %% Test case 4
-    Case4Key = list_to_binary(lists:seq(1, 16#19)),
-    Case4Data = binary:copy(<<16#cd>>, 50),
-    Case4Exp = hexstr2bin("697eaf0aca3a3aea3a75164746ffaa79"),
-
-    ?line Case4Mac_1 = crypto:md5_mac(Case4Key, Case4Data),
-    ?line Case4Mac_2 = crypto:hmac(md5, Case4Key, Case4Data),
-    ?line m(Case4Exp, Case4Mac_1),
-    ?line m(Case4Exp, Case4Mac_2),
-
-    %% Test case 5
-    Case5Key = binary:copy(<<16#0c>>, 16),
-    Case5Data = "Test With Truncation",
-    Case5Exp = hexstr2bin("56461ef2342edc00f9bab995690efd4c"),
-    Case5Exp96 = hexstr2bin("56461ef2342edc00f9bab995"),
-
-    ?line Case5Mac_1 = crypto:md5_mac(Case5Key, Case5Data),
-    ?line Case5Mac_2 = crypto:hmac(md5, Case5Key, Case5Data),
-    ?line Case5Mac96_1 = crypto:md5_mac_96(Case5Key, Case5Data),
-    ?line Case5Mac96_2 = crypto:hmac(md5, Case5Key, Case5Data, 12),
-    ?line m(Case5Exp, Case5Mac_1),
-    ?line m(Case5Exp, Case5Mac_2),
-    ?line m(Case5Exp96, Case5Mac96_1),
-    ?line m(Case5Exp96, Case5Mac96_2),
-
-    %% Test case 6
-    Case6Key = binary:copy(<<16#aa>>, 80),
-    Case6Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
-    Case6Exp = hexstr2bin("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd"),
-
-    ?line Case6Mac_1 = crypto:md5_mac(Case6Key, Case6Data),
-    ?line Case6Mac_2 = crypto:hmac(md5, Case6Key, Case6Data),
-    ?line m(Case6Exp, Case6Mac_1),
-    ?line m(Case6Exp, Case6Mac_2),
-
-    %% Test case 7
-    Case7Key = binary:copy(<<16#aa>>, 80),
-    Case7Data = <<"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data">>,
-    Case7Exp = hexstr2bin("6f630fad67cda0ee1fb1f562db3aa53e"),
-
-    ?line Case7Mac_1 = crypto:md5_mac(Case7Key, Case7Data),
-    ?line Case7Mac_2 = crypto:hmac(md5, Case7Key, Case7Data),
-    ?line m(Case7Exp, Case7Mac_1),
-    ?line m(Case7Exp, Case7Mac_2).
-
-hmac_rfc2202_sha() ->
-    %% Test case 1
-    Case1Key = binary:copy(<<16#0b>>, 20),
-    Case1Data = <<"Hi There">>,
-    Case1Exp = hexstr2bin("b617318655057264e28bc0b6fb378c8ef146be00"),
-
-    ?line Case1Mac_1 = crypto:sha_mac(Case1Key, Case1Data),
-    ?line Case1Mac_2 = crypto:hmac(sha, Case1Key, Case1Data),
-    ?line m(Case1Exp, Case1Mac_1),
-    ?line m(Case1Exp, Case1Mac_2),
-
-    %% Test case 2
-    Case2Key = <<"Jefe">>,
-    Case2Data = <<"what do ya want for nothing?">>,
-    Case2Exp = hexstr2bin("effcdf6ae5eb2fa2d27416d5f184df9c259a7c79"),
-
-    ?line Case2Mac_1 = crypto:sha_mac(Case2Key, Case2Data),
-    ?line Case2Mac_2 = crypto:hmac(sha, Case2Key, Case2Data),
-    ?line m(Case2Exp, Case2Mac_1),
-    ?line m(Case2Exp, Case2Mac_2),
-
-    %% Test case 3
-    Case3Key = binary:copy(<<16#aa>>, 20),
-    Case3Data = binary:copy(<<16#dd>>, 50),
-    Case3Exp = hexstr2bin("125d7342b9ac11cd91a39af48aa17b4f63f175d3"),
-
-    ?line Case3Mac_1 = crypto:sha_mac(Case3Key, Case3Data),
-    ?line Case3Mac_2 = crypto:hmac(sha, Case3Key, Case3Data),
-    ?line m(Case3Exp, Case3Mac_1),
-    ?line m(Case3Exp, Case3Mac_2),
-
-    %% Test case 4
-    Case4Key = list_to_binary(lists:seq(1, 16#19)),
-    Case4Data = binary:copy(<<16#cd>>, 50),
-    Case4Exp = hexstr2bin("4c9007f4026250c6bc8414f9bf50c86c2d7235da"),
-
-    ?line Case4Mac_1 = crypto:sha_mac(Case4Key, Case4Data),
-    ?line Case4Mac_2 = crypto:hmac(sha, Case4Key, Case4Data),
-    ?line m(Case4Exp, Case4Mac_1),
-    ?line m(Case4Exp, Case4Mac_2),
-
-    %% Test case 5
-    Case5Key = binary:copy(<<16#0c>>, 20),
-    Case5Data = "Test With Truncation",
-    Case5Exp = hexstr2bin("4c1a03424b55e07fe7f27be1d58bb9324a9a5a04"),
-    Case5Exp96 = hexstr2bin("4c1a03424b55e07fe7f27be1"),
-
-    ?line Case5Mac_1 = crypto:sha_mac(Case5Key, Case5Data),
-    ?line Case5Mac_2 = crypto:hmac(sha, Case5Key, Case5Data),
-    ?line Case5Mac96_1 = crypto:sha_mac_96(Case5Key, Case5Data),
-    ?line Case5Mac96_2 = crypto:hmac(sha, Case5Key, Case5Data, 12),
-    ?line m(Case5Exp, Case5Mac_1),
-    ?line m(Case5Exp, Case5Mac_2),
-    ?line m(Case5Exp96, Case5Mac96_1),
-    ?line m(Case5Exp96, Case5Mac96_2),
-
-    %% Test case 6
-    Case6Key = binary:copy(<<16#aa>>, 80),
-    Case6Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
-    Case6Exp = hexstr2bin("aa4ae5e15272d00e95705637ce8a3b55ed402112"),
-
-    ?line Case6Mac_1 = crypto:sha_mac(Case6Key, Case6Data),
-    ?line Case6Mac_2 = crypto:hmac(sha, Case6Key, Case6Data),
-    ?line m(Case6Exp, Case6Mac_1),
-    ?line m(Case6Exp, Case6Mac_2),
-
-    %% Test case 7
-    Case7Key = binary:copy(<<16#aa>>, 80),
-    Case7Data = <<"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data">>,
-    Case7Exp = hexstr2bin("e8e99d0f45237d786d6bbaa7965c7808bbff1a91"),
-
-    ?line Case7Mac_1 = crypto:sha_mac(Case7Key, Case7Data),
-    ?line Case7Mac_2 = crypto:hmac(sha, Case7Key, Case7Data),
-    ?line m(Case7Exp, Case7Mac_1),
-    ?line m(Case7Exp, Case7Mac_2).
-
-hmac_rfc4231_sha224(doc) ->
-    ["Generate an HMAC using crypto:sha224_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
-     "Testvectors are take from RFC4231." ];
-hmac_rfc4231_sha224(suite) ->
-    [];
-hmac_rfc4231_sha224(Config) when is_list(Config) ->
-    if_supported(sha224, fun() -> hmac_rfc4231_sha224_do() end).
-
-hmac_rfc4231_sha256(doc) ->
-    ["Generate an HMAC using crypto:sha256_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
-     "Testvectors are take from RFC4231." ];
-hmac_rfc4231_sha256(suite) ->
-    [];
-hmac_rfc4231_sha256(Config) when is_list(Config) ->
-    if_supported(sha256, fun() -> hmac_rfc4231_sha256_do() end).
-
-hmac_rfc4231_sha384(doc) ->
-    ["Generate an HMAC using crypto:sha384_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
-     "Testvectors are take from RFC4231." ];
-hmac_rfc4231_sha384(suite) ->
-    [];
-hmac_rfc4231_sha384(Config) when is_list(Config) ->
-    if_supported(sha384, fun() -> hmac_rfc4231_sha384_do() end).
-
-hmac_rfc4231_sha512(doc) ->
-    ["Generate an HMAC using crypto:sha512_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
-     "Testvectors are take from RFC4231." ];
-hmac_rfc4231_sha512(suite) ->
-    [];
-hmac_rfc4231_sha512(Config) when is_list(Config) ->
-    if_supported(sha512, fun() -> hmac_rfc4231_sha512_do() end).
-
-hmac_rfc4231_case(Hash, case1, Exp) ->
-    %% Test 1
-    Key = binary:copy(<<16#0b>>, 20),
-    Data = <<"Hi There">>,
-    hmac_rfc4231_case(Hash, Key, Data, Exp);
-
-hmac_rfc4231_case(Hash, case2, Exp) ->
-    %% Test 2
-    Key = <<"Jefe">>,
-    Data = <<"what do ya want for nothing?">>,
-    hmac_rfc4231_case(Hash, Key, Data, Exp);
-
-hmac_rfc4231_case(Hash, case3, Exp) ->
-    %% Test 3
-    Key = binary:copy(<<16#aa>>, 20),
-    Data = binary:copy(<<16#dd>>, 50),
-    hmac_rfc4231_case(Hash, Key, Data, Exp);
-
-hmac_rfc4231_case(Hash, case4, Exp) ->
-    %% Test 4
-    Key = list_to_binary(lists:seq(1, 16#19)),
-    Data = binary:copy(<<16#cd>>, 50),
-    hmac_rfc4231_case(Hash, Key, Data, Exp);
-
-hmac_rfc4231_case(Hash, case5, Exp) ->
-    %% Test 5
-    Key = binary:copy(<<16#0c>>, 20),
-    Data = <<"Test With Truncation">>,
-    hmac_rfc4231_case(Hash, Key, Data, 16, Exp);
-
-hmac_rfc4231_case(Hash, case6, Exp) ->
-    %% Test 6
-    Key = binary:copy(<<16#aa>>, 131),
-    Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
-    hmac_rfc4231_case(Hash, Key, Data, Exp);
-
-hmac_rfc4231_case(Hash, case7, Exp) ->
-    %% Test Case 7
-    Key = binary:copy(<<16#aa>>, 131),
-    Data = <<"This is a test using a larger than block-size key and a larger t",
-	     "han block-size data. The key needs to be hashed before being use",
-	     "d by the HMAC algorithm.">>,
-    hmac_rfc4231_case(Hash, Key, Data, Exp).
-
-hmac_rfc4231_case(Hash, Key, Data, Exp) ->
-    ?line Ctx = crypto:hmac_init(Hash, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Mac1 = crypto:hmac_final(Ctx2),
-    ?line Mac3 = crypto:hmac(Hash, Key, Data),
-    ?line m(Exp, Mac1),
-    ?line m(Exp, Mac3).
-
-hmac_rfc4231_case(Hash, Key, Data, Trunc, Exp) ->
-    ?line Ctx = crypto:hmac_init(Hash, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Mac1 = crypto:hmac_final_n(Ctx2, Trunc),
-    ?line Mac3 = crypto:hmac(Hash, Key, Data, Trunc),
-    ?line m(Exp, Mac1),
-    ?line m(Exp, Mac3).
-
-hmac_rfc4231_sha224_do() ->
-    Case1 = hexstr2bin("896fb1128abbdf196832107cd49df33f"
-		       "47b4b1169912ba4f53684b22"),
-    Case2 = hexstr2bin("a30e01098bc6dbbf45690f3a7e9e6d0f"
-		       "8bbea2a39e6148008fd05e44"),
-    Case3 = hexstr2bin("7fb3cb3588c6c1f6ffa9694d7d6ad264"
-		       "9365b0c1f65d69d1ec8333ea"),
-    Case4 = hexstr2bin("6c11506874013cac6a2abc1bb382627c"
-		       "ec6a90d86efc012de7afec5a"),
-    Case5 = hexstr2bin("0e2aea68a90c8d37c988bcdb9fca6fa8"),
-    Case6 = hexstr2bin("95e9a0db962095adaebe9b2d6f0dbce2"
-		       "d499f112f2d2b7273fa6870e"),
-    Case7 = hexstr2bin("3a854166ac5d9f023f54d517d0b39dbd"
-		       "946770db9c2b95c9f6f565d1"),
-    hmac_rfc4231_cases_do(sha224, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
-
-hmac_rfc4231_sha256_do() ->
-    Case1 = hexstr2bin("b0344c61d8db38535ca8afceaf0bf12b"
-		       "881dc200c9833da726e9376c2e32cff7"),
-    Case2 = hexstr2bin("5bdcc146bf60754e6a042426089575c7"
-		       "5a003f089d2739839dec58b964ec3843"),
-    Case3 = hexstr2bin("773ea91e36800e46854db8ebd09181a7"
-		       "2959098b3ef8c122d9635514ced565fe"),
-    Case4 = hexstr2bin("82558a389a443c0ea4cc819899f2083a"
-		       "85f0faa3e578f8077a2e3ff46729665b"),
-    Case5 = hexstr2bin("a3b6167473100ee06e0c796c2955552b"),
-    Case6 = hexstr2bin("60e431591ee0b67f0d8a26aacbf5b77f"
-		       "8e0bc6213728c5140546040f0ee37f54"),
-    Case7 = hexstr2bin("9b09ffa71b942fcb27635fbcd5b0e944"
-		       "bfdc63644f0713938a7f51535c3a35e2"),
-    hmac_rfc4231_cases_do(sha256, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
-
-hmac_rfc4231_sha384_do() ->
-    Case1 = hexstr2bin("afd03944d84895626b0825f4ab46907f"
-		       "15f9dadbe4101ec682aa034c7cebc59c"
-		       "faea9ea9076ede7f4af152e8b2fa9cb6"),
-    Case2 = hexstr2bin("af45d2e376484031617f78d2b58a6b1b"
-		       "9c7ef464f5a01b47e42ec3736322445e"
-		       "8e2240ca5e69e2c78b3239ecfab21649"),
-    Case3 = hexstr2bin("88062608d3e6ad8a0aa2ace014c8a86f"
-		       "0aa635d947ac9febe83ef4e55966144b"
-		       "2a5ab39dc13814b94e3ab6e101a34f27"),
-    Case4 = hexstr2bin("3e8a69b7783c25851933ab6290af6ca7"
-		       "7a9981480850009cc5577c6e1f573b4e"
-		       "6801dd23c4a7d679ccf8a386c674cffb"),
-    Case5 = hexstr2bin("3abf34c3503b2a23a46efc619baef897"),
-    Case6 = hexstr2bin("4ece084485813e9088d2c63a041bc5b4"
-		       "4f9ef1012a2b588f3cd11f05033ac4c6"
-		       "0c2ef6ab4030fe8296248df163f44952"),
-    Case7 = hexstr2bin("6617178e941f020d351e2f254e8fd32c"
-		       "602420feb0b8fb9adccebb82461e99c5"
-		       "a678cc31e799176d3860e6110c46523e"),
-    hmac_rfc4231_cases_do(sha384, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
-
-hmac_rfc4231_sha512_do() ->
-    Case1 = hexstr2bin("87aa7cdea5ef619d4ff0b4241a1d6cb0"
-		       "2379f4e2ce4ec2787ad0b30545e17cde"
-		       "daa833b7d6b8a702038b274eaea3f4e4"
-		       "be9d914eeb61f1702e696c203a126854"),
-    Case2 = hexstr2bin("164b7a7bfcf819e2e395fbe73b56e0a3"
-		       "87bd64222e831fd610270cd7ea250554"
-		       "9758bf75c05a994a6d034f65f8f0e6fd"
-		       "caeab1a34d4a6b4b636e070a38bce737"),
-    Case3 = hexstr2bin("fa73b0089d56a284efb0f0756c890be9"
-		       "b1b5dbdd8ee81a3655f83e33b2279d39"
-		       "bf3e848279a722c806b485a47e67c807"
-		       "b946a337bee8942674278859e13292fb"),
-    Case4 = hexstr2bin("b0ba465637458c6990e5a8c5f61d4af7"
-		       "e576d97ff94b872de76f8050361ee3db"
-		       "a91ca5c11aa25eb4d679275cc5788063"
-		       "a5f19741120c4f2de2adebeb10a298dd"),
-    Case5 = hexstr2bin("415fad6271580a531d4179bc891d87a6"),
-    Case6 = hexstr2bin("80b24263c7c1a3ebb71493c1dd7be8b4"
-		       "9b46d1f41b4aeec1121b013783f8f352"
-		       "6b56d037e05f2598bd0fd2215d6a1e52"
-		       "95e64f73f63f0aec8b915a985d786598"),
-    Case7 = hexstr2bin("e37b6a775dc87dbaa4dfa9f96e5e3ffd"
-		       "debd71f8867289865df5a32d20cdc944"
-		       "b6022cac3c4982b10d5eeb55c3e4de15"
-		       "134676fb6de0446065c97440fa8c6a58"),
-    hmac_rfc4231_cases_do(sha512, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
-
-hmac_rfc4231_cases_do(Hash, CasesData) ->
-    hmac_rfc4231_cases_do(Hash, [case1, case2, case3, case4, case5, case6, case7], CasesData).
-
-hmac_rfc4231_cases_do(_Hash, _, []) ->
+hash(_, [], []) ->
     ok;
-hmac_rfc4231_cases_do(Hash, [C|Cases], [D|CasesData]) ->
-    hmac_rfc4231_case(Hash, C, D),
-    hmac_rfc4231_cases_do(Hash, Cases, CasesData).
-
-hmac_update_md5_io(doc) ->
-    ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
-     "Expected values for examples are generated using crypto:md5_mac." ];
-hmac_update_md5_io(suite) ->
-    [];
-hmac_update_md5_io(Config) when is_list(Config) ->
-    ?line Key = ["A fine speach", "by a fine man!"],
-    ?line Data = "Sampl",
-    ?line Data2 = "e #1",
-    ?line Ctx = crypto:hmac_init(md5, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
-    ?line Mac = crypto:hmac_final(Ctx3),
-    ?line Exp = crypto:md5_mac(Key, lists:flatten([Data, Data2])), 
-    ?line m(Exp, Mac).
-    
-
-hmac_update_md5_n(doc) ->
-    ["Generate a shortened MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
-     "Expected values for examples are generated using crypto:md5_mac." ];
-hmac_update_md5_n(suite) ->
-    [];
-hmac_update_md5_n(Config) when is_list(Config) ->
-    ?line Key = ["A fine speach", "by a fine man!"],
-    ?line Data = "Sampl",
-    ?line Data2 = "e #1",
-    ?line Ctx = crypto:hmac_init(md5, Key),
-    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
-    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
-    ?line Mac = crypto:hmac_final_n(Ctx3, 12),
-    ?line Exp = crypto:md5_mac_96(Key, lists:flatten([Data, Data2])), 
-    ?line m(Exp, Mac).
-%%
-%%
-ripemd160(doc) ->
-    ["Generate RIPEMD160 message digests and check the result."];
-ripemd160(suite) ->
-    [];
-ripemd160(Config) when is_list(Config) ->
-    ?line m(crypto:hash(ripemd160,"abc"),
-	    hexstr2bin("8EB208F7E05D987A9B044A8E98C6B087F15A0BFC")),
-    ?line m(crypto:hash(ripemd160,"abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
-			  "nlmnomnopnopq"), 
-	    hexstr2bin("12A053384A9C0C88E405A06C27DCF49ADA62EB2B")).
-
-   
-%%
-%%
-ripemd160_update(doc) ->
-    ["Generate RIPEMD160 message digests by using ripemd160_init,"
-     "ripemd160_update, and ripemd160_final and check the result."];
-ripemd160_update(suite) ->
-    [];
-ripemd160_update(Config) when is_list(Config) ->
-    ?line Ctx = crypto:hash_init(ripemd160),
-    ?line Ctx1 = crypto:hash_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
-    ?line Ctx2 = crypto:hash_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
-    ?line m(crypto:hash_final(Ctx2), 
-      hexstr2bin("12A053384A9C0C88E405A06C27DCF49ADA62EB2B")).
-
-%%
-%%
-sha_update(doc) ->
-    ["Generate SHA message digests by using sha_init, sha_update, and"
-     "sha_final, and check the result. Examples are from FIPS-180-1."];
-sha_update(suite) ->
-    [];
-sha_update(Config) when is_list(Config) ->
-    ?line Ctx = crypto:sha_init(),
-    ?line Ctx1 = crypto:sha_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
-    ?line Ctx2 = crypto:sha_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
-    ?line m(crypto:sha_final(Ctx2), 
-	    hexstr2bin("84983E441C3BD26EBAAE4AA1F95129E5E54670F1")).
-
-%%
-%%
-sha256(doc) ->
-    ["Generate SHA-256 message digests and check the result. Examples are "
-     "from rfc-4634."];
-sha256(suite) ->
-    [];
-sha256(Config) when is_list(Config) ->
-    if_supported(sha256, fun() -> sha256_do() end).
-
-sha256_do() ->
-    ?line m(crypto:hash(sha256, "abc"),
-	    hexstr2bin("BA7816BF8F01CFEA4141"
-		       "40DE5DAE2223B00361A396177A9CB410FF61F20015AD")),
-    ?line m(crypto:hash(sha256, "abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
-			  "nlmnomnopnopq"), 
-	    hexstr2bin("248D6A61D20638B8"
-		       "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1")).
-
-%%
-%%
-sha256_update(doc) ->
-    ["Generate SHA256 message digests by using sha256_init, sha256_update, and"
-     "sha256_final, and check the result. Examples are from rfc-4634."];
-sha256_update(suite) ->
-    [];
-sha256_update(Config) when is_list(Config) ->
-    if_supported(sha256, fun() -> sha256_update_do() end).
-
-sha256_update_do() ->
-    ?line Ctx = crypto:hash_init(sha256),
-    ?line Ctx1 = crypto:hash_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
-    ?line Ctx2 = crypto:hash_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
-    ?line m(crypto:hash_final(Ctx2),
-	    hexstr2bin("248D6A61D20638B8"
-		       "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1")).
-
-
-%%
-%%
-sha512(doc) ->
-    ["Generate SHA-512 message digests and check the result. Examples are "
-     "from rfc-4634."];
-sha512(suite) ->
-    [];
-sha512(Config) when is_list(Config) ->
-    if_supported(sha512, fun() -> sha512_do() end).
-
-sha512_do() ->
-    ?line m(crypto:hash(sha512, "abc"),
-	    hexstr2bin("DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA2"
-		       "0A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD"
-		       "454D4423643CE80E2A9AC94FA54CA49F")),
-    ?line m(crypto:hash(sha512, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
-			  "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"), 
-	    hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
-		       "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
-		       "C7D329EEB6DD26545E96E55B874BE909")).
-
-%%
-%%
-sha512_update(doc) ->
-    ["Generate SHA512 message digests by using sha512_init, sha512_update, and"
-     "sha512_final, and check the result. Examples are from rfc=4634."];
-sha512_update(suite) ->
-    [];
-sha512_update(Config) when is_list(Config) ->
-    if_supported(sha512, fun() -> sha512_update_do() end).
-
-sha512_update_do() ->
-    ?line Ctx = crypto:hash_init(sha512),
-    ?line Ctx1 = crypto:hash_update(Ctx, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"),
-    ?line Ctx2 = crypto:hash_update(Ctx1, "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"),
-    ?line m(crypto:hash_final(Ctx2),
-	    hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
-		       "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
-		       "C7D329EEB6DD26545E96E55B874BE909")).
-
-%%
-%%
-md5_mac(doc) ->
-    ["Generate some HMACs, using MD5, and check the result. Examples are "
-     "from RFC-2104."];
-md5_mac(suite) ->
-    [];
-md5_mac(Config) when is_list(Config) ->
-    ?line m(crypto:md5_mac(hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
-			   "Hi There"),
-	    hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d")),
-    ?line m(crypto:md5_mac(list_to_binary("Jefe"), 
-				     "what do ya want for nothing?"),
-	    hexstr2bin("750c783e6ab0b503eaa86e310a5db738")),
-    ?line m(crypto:md5_mac(hexstr2bin("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"),
-			   hexstr2bin("DDDDDDDDDDDDDDDDDDDD"
-				      "DDDDDDDDDDDDDDDDDDDD"
-				      "DDDDDDDDDDDDDDDDDDDD"
-				      "DDDDDDDDDDDDDDDDDDDD"
-				      "DDDDDDDDDDDDDDDDDDDD")),
-	    hexstr2bin("56be34521d144c88dbb8c733f0e8b3f6")).
-
-%%
-%%
-md5_mac_io(doc) ->
-    ["Generate some HMACs, using MD5, with Key an IO-list, and check the "
-     "result. Examples are from RFC-2104."];
-md5_mac_io(suite) ->
-    [];
-md5_mac_io(Config) when is_list(Config) ->
-    ?line Key1 = hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
-    ?line {B11, B12} = split_binary(Key1, 4),
-    ?line Key11 = [B11,binary_to_list(B12)],
-    ?line m(crypto:md5_mac(Key11, "Hi There"),
-	    hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d")).
-
-%%
-%%
-des_cbc(doc) ->
-    "Encrypt and decrypt according to CBC DES. and check the result. "
-	"Example are from FIPS-81.";
-des_cbc(suite) ->
-    [];
-des_cbc(Config) when is_list(Config) ->
-    ?line Key =  hexstr2bin("0123456789abcdef"),
-    ?line IVec = hexstr2bin("1234567890abcdef"),
-    ?line Plain = "Now is the time for all ",
-    ?line Cipher = crypto:des_cbc_encrypt(Key, IVec, Plain),
-    ?line m(Cipher, hexstr2bin("e5c7cdde872bf27c43e934008c389c"
-			       "0f683788499a7c05f6")),
-    ?line m(list_to_binary(Plain), 
-	    crypto:des_cbc_decrypt(Key, IVec, Cipher)),
-    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
-    ?line Cipher2 = crypto:des_cbc_encrypt(Key, IVec, Plain2),
-    ?line m(Cipher2, hexstr2bin("b9916b8ee4c3da64b4f44e3cbefb9"
-				"9484521388fa59ae67d58d2e77e86062733")),
-    ?line m(list_to_binary(Plain2), 
-	    crypto:des_cbc_decrypt(Key, IVec, Cipher2)).
-
-%%
-%%
-des_cbc_iter(doc) ->
-        "Encrypt and decrypt according to CBC DES in two steps, and "
-    "check the result. Example are from FIPS-81.";
-des_cbc_iter(suite) ->
-    [];
-des_cbc_iter(Config) when is_list(Config) ->
-    ?line Key =  hexstr2bin("0123456789abcdef"),
-    ?line IVec = hexstr2bin("1234567890abcdef"),
-    ?line Plain1 = "Now is the time ",
-    ?line Plain2 = "for all ",
-    ?line Cipher1 = crypto:des_cbc_encrypt(Key, IVec, Plain1),
-    ?line IVec2 = crypto:des_cbc_ivec(Cipher1),
-    ?line Cipher2 = crypto:des_cbc_encrypt(Key, IVec2, Plain2),
-    ?line Cipher = list_to_binary([Cipher1, Cipher2]),
-    ?line m(Cipher, hexstr2bin("e5c7cdde872bf27c43e934008c389c"
-			             "0f683788499a7c05f6")).
-
-%%
-%%
-des_cfb(doc) ->
-    "Encrypt and decrypt according to CFB DES. and check the result. "
-	"Example is from FIPS-81.";
-des_cfb(suite) ->
-    [];
-des_cfb(Config) when is_list(Config) ->
-    ?line Key =  hexstr2bin("0123456789abcdef"),
-    ?line IVec = hexstr2bin("1234567890abcdef"),
-    ?line Plain = "Now is the",
-    ?line Cipher = crypto:des_cfb_encrypt(Key, IVec, Plain),
-    ?line m(Cipher, hexstr2bin("f31fda07011462ee187f")),
-    ?line m(list_to_binary(Plain),
-	    crypto:des_cfb_decrypt(Key, IVec, Cipher)).
-
-%%
-%%
-des_cfb_iter(doc) ->
-        "Encrypt and decrypt according to CFB DES in two steps, and "
-    "check the result. Example is from FIPS-81.";
-des_cfb_iter(suite) ->
-    [];
-des_cfb_iter(Config) when is_list(Config) ->
-    ?line Key =  hexstr2bin("0123456789abcdef"),
-    ?line IVec = hexstr2bin("1234567890abcdef"),
-    ?line Plain1 = "Now i",
-    ?line Plain2 = "s the",
-    ?line Cipher1 = crypto:des_cfb_encrypt(Key, IVec, Plain1),
-    ?line IVec2 = crypto:des_cfb_ivec(IVec, Cipher1),
-    ?line Cipher2 = crypto:des_cfb_encrypt(Key, IVec2, Plain2),
-    ?line Cipher = list_to_binary([Cipher1, Cipher2]),
-    ?line m(Cipher, hexstr2bin("f31fda07011462ee187f")).
-
-%%
-%%
-des_ecb(doc) ->
-    "Encrypt and decrypt according to ECB DES and check the result. "
-    "Example are from FIPS-81.";
-des_ecb(suite) ->
-    [];
-des_ecb(Config) when is_list(Config) ->
-    ?line Key =  hexstr2bin("0123456789abcdef"),
-    ?line Cipher1 = crypto:des_ecb_encrypt(Key, "Now is t"),
-    ?line m(Cipher1, hexstr2bin("3fa40e8a984d4815")),
-    ?line Cipher2 = crypto:des_ecb_encrypt(Key, "he time "),
-    ?line m(Cipher2, hexstr2bin("6a271787ab8883f9")),
-    ?line Cipher3 = crypto:des_ecb_encrypt(Key, "for all "),
-    ?line m(Cipher3, hexstr2bin("893d51ec4b563b53")),
-    ?line Cipher4 = crypto:des_ecb_decrypt(Key, hexstr2bin("3fa40e8a984d4815")),
-    ?line m(Cipher4, <<"Now is t">>),
-    ?line Cipher5 = crypto:des_ecb_decrypt(Key, hexstr2bin("6a271787ab8883f9")),
-    ?line m(Cipher5, <<"he time ">>),
-    ?line Cipher6 = crypto:des_ecb_decrypt(Key, hexstr2bin("893d51ec4b563b53")),
-    ?line m(Cipher6, <<"for all ">>).
-%%
-%%
-rc2_cbc(doc) ->
-    "Encrypt and decrypt according to RC2 CBC and check the result. "
-    "Example stripped out from public_key application test";
-rc2_cbc(Config) when is_list(Config) ->
-   
-    Key = <<146,210,160,124,215,227,153,239,227,17,222,140,3,93,27,191>>,
-    IV = <<72,91,135,182,25,42,35,210>>,
-
-    Cipher = <<36,245,206,158,168,230,58,69,148,137,32,192,250,41,237,181,181,251, 192,2,175,135,177,171,57,30,111,117,159,149,15,28,88,158,28,81,28,115, 85,219,241,82,117,222,91,85,73,117,164,25,182,52,191,64,123,57,26,19, 211,27,253,31,194,219,231,104,247,240,172,130,119,21,225,154,101,247, 32,216,42,216,133,169,78,22,97,27,227,26,196,224,172,168,17,9,148,55, 203,91,252,40,61,226,236,221,215,160,78,63,13,181,68,57,196,241,185, 207, 116,129,152,237,60,139,247,153,27,146,161,246,222,98,185,222,152, 187,135, 236,86,34,7,110,91,230,173,34,160,242,202,222,121,127,181,140, 101,203,195, 190,88,250,86,147,127,87,72,126,171,16,71,47,110,248,88, 14,29,143,161,152, 129,236,148,22,152,186,208,119,70,8,174,193,203,100, 193,203,200,117,102,242, 134,142,96,125,135,200,217,190,76,117,50,70, 209,186,101,241,200,91,40,193,54, 90,195,38,47,59,197,38,234,86,223,16, 51,253,204,129,20,171,66,21,241,26,135,216, 196,114,110,91,15,53,40, 164,201,136,113,95,247,51,181,208,241,68,168,98,151,36, 155,72,24,57, 42,191,14,125,204,10,167,214,233,138,115,125,234,121,134,227,26,247, 77,200,117,110,117,111,168,156,206,67,159,149,189,173,150,193,91,199, 216,153,22, 189,137,185,89,160,13,131,132,58,109,28,110,246,252,251,14, 232,91,38,52,29,101,188,69,123,50,0,130,178,93,73,239,118,7,77,35,59, 253,10,159,45,86,142,37,78,232,48>>,
-    Text = <<48,130,1,85,2,1,0,48,13,6,9,42,134,72,134,247,13,1,1,1,5,0,4,130,1,63,48,130, 1,59,2,1,0,2,65,0,222,187,252,44,9,214,27,173,162,169,70,47,36,34,78,84,204, 107,60,192,117,95,21,206,49,142,245,126,121,223,23,2,107,106,133,204,161,36, 40,2,114,69,4,93,242,5,42,50,154,47,154,211,209,123,120,161,5,114,173,155,34, 191,52,59,2,3,1,0,1,2,64,45,144,169,106,220,236,71,39,67,82,123,192,35,21,61, 143,13,110,150,180,12,142,210,40,39,109,70,125,132,51,6,66,159,134,112,85, 155,243,118,221,65,133,127,99,151,194,252,141,149,224,229,62,214,45,228,32, 184,85,67,14,228,161,184,161,2,33,0,255,202,240,131,130,57,49,224,115,255,83, 79,6,165,212,21,179,212,20,188,97,74,69,68,163,223,247,237,39,24,23,235,2,33, 0,222,234,48,36,33,23,219,45,59,136,55,245,143,29,165,48,255,131,207,146,131, 104,13,163,54,131,236,78,88,54,16,241,2,33,0,230,2,99,129,173,176,166,131, 241,106,143,76,9,107,70,41,121,185,228,39,124,200,159,62,216,169,5,180,111, 169,255,159,2,33,0,151,193,70,212,209,210,179,219,175,83,165,4,255,81,103,76, 92,39,24,0,222,132,208,3,244,241,10,198,171,54,227,129,2,32,43,250,20,31,16, 189,168,116,225,1,125,132,94,130,118,124,28,56,232,39,69,218,244,33,240,200, 205,9,215,101,35,135,7,7,7,7,7,7,7>>,
-    
-    Text = crypto:rc2_cbc_decrypt(Key, IV, Cipher),
-    Cipher = crypto:rc2_cbc_encrypt(Key, IV, Text).
-
-%%
-%%
-des3_cbc(doc) ->
-    "Encrypt and decrypt according to CBC 3DES, and check the result.";
-des3_cbc(suite) ->
-    [];
-des3_cbc(Config) when is_list(Config) ->
-    ?line Key1 = hexstr2bin("0123456789abcdef"),
-    ?line Key2 = hexstr2bin("fedcba9876543210"),
-    ?line Key3 = hexstr2bin("0f2d4b6987a5c3e1"),
-    ?line IVec = hexstr2bin("1234567890abcdef"),
-    ?line Plain = "Now is the time for all ",
-    ?line Cipher = crypto:des3_cbc_encrypt(Key1, Key2, Key3, IVec, Plain),
-    ?line m(Cipher, hexstr2bin("8a2667ee5577267cd9b1af2c5a0480"
-			       "0bac1ae66970fb2b89")),
-    ?line m(list_to_binary(Plain),
-	    crypto:des3_cbc_decrypt(Key1, Key2, Key3, IVec, Cipher)),
-    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
-    ?line Cipher2 = crypto:des3_cbc_encrypt(Key1, Key2, Key3, IVec, Plain2),
-    ?line m(Cipher2, hexstr2bin("eb33ec6ede2c8e90f6877e77b95d5"
-				"4c83cee22907f7f0041ca1b7abe202bfafe")),
-    ?line m(list_to_binary(Plain2),
-	    crypto:des3_cbc_decrypt(Key1, Key2, Key3, IVec, Cipher2)),
-
-    ?line Key =  hexstr2bin("0123456789abcdef"),
-    ?line DESCipher = crypto:des3_cbc_encrypt(Key, Key, Key, IVec, Plain),
-    ?line m(DESCipher, hexstr2bin("e5c7cdde872bf27c43e934008c389c"
-			       "0f683788499a7c05f6")),
-    ?line m(list_to_binary(Plain),
-	    crypto:des3_cbc_decrypt(Key, Key, Key, IVec, DESCipher)),
-    ?line DESCipher2 = crypto:des3_cbc_encrypt(Key, Key, Key, IVec, Plain2),
-    ?line m(DESCipher2, hexstr2bin("b9916b8ee4c3da64b4f44e3cbefb9"
-				"9484521388fa59ae67d58d2e77e86062733")),
-    ?line m(list_to_binary(Plain2),
-	    crypto:des3_cbc_decrypt(Key, Key, Key, IVec, DESCipher2)).
-
-%%
-%%
-des3_cfb(doc) ->
-    "Encrypt and decrypt according to CFB 3DES, and check the result.";
-des3_cfb(suite) ->
-    [];
-des3_cfb(Config) when is_list(Config) ->
-    case openssl_version() of
-	V when V < 16#90705F -> {skipped,"OpenSSL version too old"};
-	_ -> des3_cfb_do()
+hash(Type, [Msg | RestMsg], [Digest| RestDigest]) ->
+    case crypto:hash(Type, Msg) of
+	Digest ->
+	    hash(Type, RestMsg, RestDigest);
+	Other ->
+	    ct:fail({{crypto, hash, [Type, Msg]}, {expected, Digest}, {got, Other}})
     end.
 
-des3_cfb_do() ->
-    ?line Key1 = hexstr2bin("0123456789abcdef"),
-    ?line Key2 = hexstr2bin("fedcba9876543210"),
-    ?line Key3 = hexstr2bin("0f2d4b6987a5c3e1"),
-    ?line IVec = hexstr2bin("1234567890abcdef"),
-    ?line Plain = "Now is the time for all ",
-    ?line Cipher = crypto:des3_cfb_encrypt(Key1, Key2, Key3, IVec, Plain),
-    ?line m(Cipher, hexstr2bin("fc0ba7a20646ba53cc8bff263f0937"
-			       "1deab42a00666db02c")),
-    ?line m(list_to_binary(Plain),
-	    crypto:des3_cfb_decrypt(Key1, Key2, Key3, IVec, Cipher)),
-    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
-    ?line Cipher2 = crypto:des3_cfb_encrypt(Key1, Key2, Key3, IVec, Plain2),
-    ?line m(Cipher2, hexstr2bin("8582c59ac01897422632c0accb66c"
-				"e413f5efab838fce7e41e2ba67705bad5bc")),
-    ?line m(list_to_binary(Plain2),
-	    crypto:des3_cfb_decrypt(Key1, Key2, Key3, IVec, Cipher2)).
-
-%%
-%%
-aes_cfb(doc) ->
-    "Encrypt and decrypt according to AES CFB 128 bit and check "
-	"the result. Example are from NIST SP 800-38A.";
-
-aes_cfb(suite) ->
-    [];
-aes_cfb(Config) when is_list(Config) ->
-
-%% Sample data from NIST Spec.Publ. 800-38A
-%% F.3.13 CFB128-AES128.Encrypt
-%% Key            2b7e151628aed2a6abf7158809cf4f3c
-%% IV             000102030405060708090a0b0c0d0e0f
-%% Segment #1
-%% Input Block    000102030405060708090a0b0c0d0e0f
-%% Output Block   50fe67cc996d32b6da0937e99bafec60
-%% Plaintext      6bc1bee22e409f96e93d7e117393172a
-%% Ciphertext     3b3fd92eb72dad20333449f8e83cfb4a
-%% Segment #2
-%% Input Block    3b3fd92eb72dad20333449f8e83cfb4a
-%% Output Block   668bcf60beb005a35354a201dab36bda
-%% Plaintext      ae2d8a571e03ac9c9eb76fac45af8e51
-%% Ciphertext     c8a64537a0b3a93fcde3cdad9f1ce58b
-%% Segment #3
-%% Input Block    c8a64537a0b3a93fcde3cdad9f1ce58b
-%% Output Block   16bd032100975551547b4de89daea630
-%% Plaintext      30c81c46a35ce411e5fbc1191a0a52ef
-%% Ciphertext     26751f67a3cbb140b1808cf187a4f4df
-%% Segment #4
-%% Input Block    26751f67a3cbb140b1808cf187a4f4df
-%% Output Block   36d42170a312871947ef8714799bc5f6
-%% Plaintext      f69f2445df4f9b17ad2b417be66c3710
-%% Ciphertext     c04b05357c5d1c0eeac4c66f9ff7f2e6
-
-    ?line Key =  hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
-    ?line IVec = hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-    ?line Plain = hexstr2bin("6bc1bee22e409f96e93d7e117393172a"),
-    ?line Cipher = hexstr2bin("3b3fd92eb72dad20333449f8e83cfb4a"),
-
-    %% Try all prefixes of plain and cipher.
-    aes_cfb_do(byte_size(Plain), Plain, Cipher, Key, IVec).
-
-aes_cfb_do(N, Plain, Cipher, Key, IVec) when N >= 0 ->
-    <<P:N/binary, _/binary>> = Plain,
-    <<C:N/binary, _/binary>> = Cipher,
-    ?line C = crypto:aes_cfb_128_encrypt(Key, IVec, P),
-    ?line P = crypto:aes_cfb_128_decrypt(Key, IVec, C),
-    aes_cfb_do(N-1, Plain, Cipher, Key, IVec);
-aes_cfb_do(_, _, _, _, _) -> ok.
-
-
-%%
-%%
-aes_cbc(doc) ->
-    "Encrypt and decrypt according to AES CBC 128 bit. and check the result. "
-	"Example are from NIST SP 800-38A.";
-
-aes_cbc(suite) ->
-    [];
-aes_cbc(Config) when is_list(Config) ->
-
-%% Sample data from NIST Spec.Publ. 800-38A
-%% F.2.1 CBC-AES128.Encrypt
-%% Key 2b7e151628aed2a6abf7158809cf4f3c 
-%% IV 000102030405060708090a0b0c0d0e0f 
-%% Block #1 
-%% Plaintext 6bc1bee22e409f96e93d7e117393172a 
-%% Input Block 6bc0bce12a459991e134741a7f9e1925 
-%% Output Block 7649abac8119b246cee98e9b12e9197d 
-%% Ciphertext 7649abac8119b246cee98e9b12e9197d 
-%% Block #2 
-%% Plaintext ae2d8a571e03ac9c9eb76fac45af8e51 
-%% Input Block d86421fb9f1a1eda505ee1375746972c 
-%% Output Block 5086cb9b507219ee95db113a917678b2 
-%% Ciphertext 5086cb9b507219ee95db113a917678b2 
-%% Block #3 
-%% Plaintext 30c81c46a35ce411e5fbc1191a0a52ef 
-%% Input Block 604ed7ddf32efdff7020d0238b7c2a5d 
-%% Output Block 73bed6b8e3c1743b7116e69e22229516 
-%% Ciphertext 73bed6b8e3c1743b7116e69e22229516 
-%% Block #4 
-%% Plaintext f69f2445df4f9b17ad2b417be66c3710 
-%% Input Block 8521f2fd3c8eef2cdc3da7e5c44ea206 
-%% Output Block 3ff1caa1681fac09120eca307586e1a7 
-%% Ciphertext 3ff1caa1681fac09120eca307586e1a7 
-%%
-%% F.2.2 CBC-AES128.Decrypt 
-%% Key 2b7e151628aed2a6abf7158809cf4f3c 
-%% IV 000102030405060708090a0b0c0d0e0f 
-    %% Block #1 
-%% Ciphertext 7649abac8119b246cee98e9b12e9197d 
-%% Input Block 7649abac8119b246cee98e9b12e9197d 
-%% Output Block 6bc0bce12a459991e134741a7f9e1925 
-%% Plaintext 6bc1bee22e409f96e93d7e117393172a 
-%% Block #2 
-%% Ciphertext 5086cb9b507219ee95db113a917678b2 
-%% Input Block 5086cb9b507219ee95db113a917678b2 
-%% Output Block d86421fb9f1a1eda505ee1375746972c 
-%% Plaintext ae2d8a571e03ac9c9eb76fac45af8e51 
-%% Block #3 
-%% Ciphertext 73bed6b8e3c1743b7116e69e22229516 
-%% Input Block 73bed6b8e3c1743b7116e69e22229516 
-%% Output Block 604ed7ddf32efdff7020d0238b7c2a5d 
-%% Plaintext 30c81c46a35ce411e5fbc1191a0a52ef 
-%% Block #4 
-%% Ciphertext 3ff1caa1681fac09120eca307586e1a7 
-%% Input Block 3ff1caa1681fac09120eca307586e1a7
-%% Output Block 8521f2fd3c8eef2cdc3da7e5c44ea206 
-%% Plaintext f69f2445df4f9b17ad2b417be66c3710
-
-    ?line Key =  hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
-    ?line IVec = hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-    ?line Plain = hexstr2bin("6bc1bee22e409f96e93d7e117393172a"),
-    ?line Cipher = crypto:aes_cbc_128_encrypt(Key, IVec, Plain),
-    ?line m(Cipher, hexstr2bin("7649abac8119b246cee98e9b12e9197d")),
-    ?line m(Plain, 
-	    crypto:aes_cbc_128_decrypt(Key, IVec, Cipher)).
-
-aes_cbc_iter(doc) ->
-    "Encrypt and decrypt according to CBC AES in steps";
-aes_cbc_iter(suite) -> [];
-aes_cbc_iter(Config) when is_list(Config) ->
-    Key = list_to_binary(lists:seq(255,256-16*17,-17)),
-    IVec = list_to_binary(lists:seq(1,16*7,7)),
-    Plain = <<"One, two, three o'clock, four o'clock, rock"
-	     "Five, six, seven o'clock, eight o'clock, rock"
-	     "Nine, ten, eleven o'clock, twelve o'clock, rock"
-	     "We're gonna rock around the clock tonight">>,
-    ?line 0 = size(Plain) rem 16,
-
-    ?line Cipher = crypto:aes_cbc_128_encrypt(Key, IVec, Plain),
-    ?line Plain = crypto:aes_cbc_128_decrypt(Key, IVec, Cipher),
-    
-    ?line Cipher = aes_cbc_encrypt_iter(Key,IVec,Plain,<<>>),
-    ?line Plain = aes_cbc_decrypt_iter(Key,IVec,Cipher,<<>>),
-    ok.
+hash_increment(Type, Increments, Digest) ->
+    State = crypto:hash_init(Type),
+    case hash_increment(State, Increments) of
+	Digest ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, "hash_init/update/final", [Type, Increments]}, {expected, Digest}, {got, Other}})  
+    end.
 
-aes_cbc_encrypt_iter(_,_,<<>>, Acc) ->
-    Acc;
-aes_cbc_encrypt_iter(Key,IVec,Data, Acc) ->
-    Bytes = 16 * (1 + size(Data) div (16*3)),
-    <<Chunk:Bytes/binary, Rest/binary>> = Data,
-    %%io:format("encrypt iter Chunk=~p Rest=~p\n",[Chunk,Rest]),
-    ?line Cipher = crypto:aes_cbc_128_encrypt(Key, IVec, Chunk),
-    ?line IVec2 = crypto:aes_cbc_ivec(Cipher),
-    aes_cbc_encrypt_iter(Key,IVec2,Rest, <<Acc/binary, Cipher/binary>>).
-
-aes_cbc_decrypt_iter(_,_,<<>>, Acc) ->
-    Acc;
-aes_cbc_decrypt_iter(Key,IVec,Data, Acc) ->
-    Bytes = 16 * (1 + size(Data) div (16*5)),
-    <<Chunk:Bytes/binary, Rest/binary>> = Data,
-    %%io:format("decrypt iter Chunk=~p Rest=~p\n",[Chunk,Rest]),
-    ?line Plain = crypto:aes_cbc_128_decrypt(Key, IVec, Chunk),
-    ?line IVec2 = crypto:aes_cbc_ivec(Chunk),
-    aes_cbc_decrypt_iter(Key,IVec2,Rest, <<Acc/binary, Plain/binary>>).
-
-
-aes_ctr(doc) -> "CTR";
-aes_ctr(Config) when is_list(Config) ->
-    %% Sample data from NIST Spec.Publ. 800-38A
-    %% F.5.1 CTR-AES128.Encrypt
-    Key128 = hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
-    Samples128 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", % Input Block
-                   "6bc1bee22e409f96e93d7e117393172a", % Plaintext
-                   "874d6191b620e3261bef6864990db6ce"},% Ciphertext
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
-                   "ae2d8a571e03ac9c9eb76fac45af8e51",
-                   "9806f66b7970fdff8617187bb9fffdff"},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
-                   "30c81c46a35ce411e5fbc1191a0a52ef",
-                   "5ae4df3edbd5d35e5b4f09020db03eab"},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
-                   "f69f2445df4f9b17ad2b417be66c3710",
-                   "1e031dda2fbe03d1792170a0f3009cee"}],
-    lists:foreach(fun(S) -> aes_ctr_do(Key128,S) end, Samples128),
-
-    %% F.5.3  CTR-AES192.Encrypt
-    Key192 =  hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-    Samples192 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", % Input Block
-                   "6bc1bee22e409f96e93d7e117393172a", % Plaintext
-                   "1abc932417521ca24f2b0459fe7e6e0b"},% Ciphertext
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
-                   "ae2d8a571e03ac9c9eb76fac45af8e51",
-                   "090339ec0aa6faefd5ccc2c6f4ce8e94"},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
-                   "30c81c46a35ce411e5fbc1191a0a52ef",
-                   "1e36b26bd1ebc670d1bd1d665620abf7"},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
-                   "f69f2445df4f9b17ad2b417be66c3710",
-                   "4f78a7f6d29809585a97daec58c6b050"}],    
-    lists:foreach(fun(S) -> aes_ctr_do(Key192,S) end, Samples192),
-
-    %% F.5.5  CTR-AES256.Encrypt
-    Key256 = hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-    Samples256 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",  % Input Block
-                    "6bc1bee22e409f96e93d7e117393172a", % Plaintext
-                    "601ec313775789a5b7a7f504bbf3d228"},% Ciphertext
-                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
-                    "ae2d8a571e03ac9c9eb76fac45af8e51",
-                    "f443e3ca4d62b59aca84e990cacaf5c5"},
-                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
-                    "30c81c46a35ce411e5fbc1191a0a52ef",
-                    "2b0930daa23de94ce87017ba2d84988d"},
-                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
-                    "f69f2445df4f9b17ad2b417be66c3710",
-                    "dfc9c58db67aada613c2dd08457941a6"}],
-    lists:foreach(fun(S) -> aes_ctr_do(Key256,S) end, Samples256).
-
-
-aes_ctr_do(Key,{IVec, Plain, Cipher}) ->
-    ?line I = hexstr2bin(IVec),
-    ?line P = hexstr2bin(Plain),
-    ?line C = crypto:aes_ctr_encrypt(Key, I, P),
-    ?line m(C, hexstr2bin(Cipher)),
-    ?line m(P, crypto:aes_ctr_decrypt(Key, I, C)).
-
-aes_ctr_stream(doc) -> "CTR Streaming";
-aes_ctr_stream(Config) when is_list(Config) ->
-    %% Sample data from NIST Spec.Publ. 800-38A
-    %% F.5.1 CTR-AES128.Encrypt
-    Key128 = hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
-    Samples128 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",       % Input Block
-                   ["6bc1bee22e409f", "96e93d7e117393172a"], % Plaintext
-                   ["874d6191b620e3261bef6864990db6ce"]},    % Ciphertext
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
-                   ["ae2d8a57", "1e03ac9c", "9eb76fac", "45af8e51"],
-                   ["9806f66b7970fdff","8617187bb9fffdff"]},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
-                   ["30c81c46a35c", "e411e5fbc119", "1a0a52ef"],
-                   ["5ae4df3e","dbd5d3","5e5b4f0902","0db03eab"]},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
-                   ["f69f2445df4f9b17ad2b417be66c3710"],
-                   ["1e031dda2fbe","03d1792170a0","f3009cee"]}],
-    lists:foreach(fun(S) -> aes_ctr_stream_do(Key128,S) end, Samples128),
-
-    %% F.5.3  CTR-AES192.Encrypt
-    Key192 =  hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-    Samples192 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",   % Input Block
-                   ["6bc1bee22e409f96e93d7e117393172a"], % Plaintext
-                   ["1abc9324","17521c","a24f2b04","59fe7e6e0b"]},  % Ciphertext
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
-                   ["ae2d8a57", "1e03ac9c9eb76fac", "45af8e51"],
-                   ["090339ec0aa6faefd5ccc2c6f4ce8e94"]},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
-                   ["30c81c46a35ce411", "e5fbc1191a0a52ef"],
-                   ["1e36b26bd1","ebc670d1bd1d","665620abf7"]},
-                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
-                   ["f69f2445", "df4f9b17ad", "2b417be6", "6c3710"],
-                   ["4f78a7f6d2980958","5a97daec58c6b050"]}],    
-    lists:foreach(fun(S) -> aes_ctr_stream_do(Key192,S) end, Samples192),
-
-    %% F.5.5  CTR-AES256.Encrypt
-    Key256 = hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-    Samples256 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",         % Input Block
-                    ["6bc1bee22e409f96", "e93d7e117393172a"],  % Plaintext
-                    ["601ec313775789", "a5b7a7f504bbf3d228"]}, % Ciphertext
-                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
-                    ["ae2d8a571e03ac9c9eb76fac45af8e51"],
-                    ["f443e3ca","4d62b59aca84","e990cacaf5c5"]},
-                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
-                    ["30c81c46","a35ce411","e5fbc119","1a0a52ef"],
-                    ["2b0930daa23de94ce87017ba2d84988d"]},
-                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
-                    ["f69f2445df4f","9b17ad2b41","7be66c3710"],
-                    ["dfc9c5","8db67aada6","13c2dd08","457941a6"]}],
-    lists:foreach(fun(S) -> aes_ctr_stream_do(Key256,S) end, Samples256).
-
-
-aes_ctr_stream_do(Key,{IVec, PlainList, CipherList}) ->
-    ?line I = hexstr2bin(IVec),
-    ?line S = crypto:aes_ctr_stream_init(Key, I),
-    ?line C = aes_ctr_stream_do_iter(
-                S, PlainList, [], 
-                fun(S2,P) -> crypto:aes_ctr_stream_encrypt(S2, P) end),
-    ?line m(C, hexstr2bin(lists:flatten(CipherList))),
-    ?line P = aes_ctr_stream_do_iter(
-                S, CipherList, [], 
-                fun(S2,C2) -> crypto:aes_ctr_stream_decrypt(S2, C2) end),
-    ?line m(P, hexstr2bin(lists:flatten(PlainList))).
-
-aes_ctr_stream_do_iter(_State, [], Acc, _CipherFun) ->
-    iolist_to_binary(lists:reverse(Acc));
-aes_ctr_stream_do_iter(State, [Plain|Rest], Acc, CipherFun) ->
-    ?line P = hexstr2bin(Plain),
-    ?line {S2, C} = CipherFun(State, P),
-    aes_ctr_stream_do_iter(S2, Rest, [C | Acc], CipherFun).
+hash_increment(State, []) ->
+    crypto:hash_final(State);
+hash_increment(State0, [Increment | Rest]) ->
+    State = crypto:hash_update(State0, Increment),
+    hash_increment(State, Rest).
 
-%%
-%%
-mod_exp_test(doc) ->
-    "mod_exp testing (A ^ M % P with bignums)";
-mod_exp_test(suite) ->
-    [];
-mod_exp_test(Config) when is_list(Config) ->
-    mod_exp_aux_test(2, 5, 10, 8).
-
-mod_exp_aux_test(_, _, _, 0) ->
+hmac(_, [],[],[]) ->
     ok;
-mod_exp_aux_test(B, E, M, N) ->
-    ?line R1 = crypto:mod_exp(B, E, M),
-    ?line R2 = ipow(B, E, M),
-    ?line m(R1, R2),
-    ?line mod_exp_aux_test(B, E*E+1, M*M+1, N-1).
-
-%%
-%%
-rand_uniform_test(doc) ->
-    "rand_uniform and random_bytes testing";
-rand_uniform_test(suite) ->
-    [];
-rand_uniform_test(Config) when is_list(Config) ->
-    rand_uniform_aux_test(10),
-    ?line 10 = size(crypto:rand_bytes(10)).
-
-rand_uniform_aux_test(0) ->
-    ok;
-rand_uniform_aux_test(N) ->
-    ?line L = N*1000,
-    ?line H = N*100000+1,
-    ?line crypto_rand_uniform(L, H),
-    ?line crypto_rand_uniform(-L, L),
-    ?line crypto_rand_uniform(-H, -L),
-    ?line crypto_rand_uniform(-H, L),
-    ?line rand_uniform_aux_test(N-1).
-
-crypto_rand_uniform(L,H) ->
-    ?line R1 = crypto:rand_uniform(L, H),
-    ?line t(R1 >= L),
-    ?line t(R1 < H).
+hmac(sha = Type, [Key | Keys], [ <<"Test With Truncation">> = Data| Rest], [Expected | Expects]) ->
+    case crypto:hmac(Type, Key, Data, 20) of
+	Expected ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, hmac, [Type, Key, Data]}, {expected, Expected}, {got, Other}})
+    end,  
+    hmac(Type, Keys, Rest, Expects);
+
+hmac(Type, [Key | Keys], [ <<"Test With Truncation">> = Data| Rest], [Expected | Expects]) ->
+    case crypto:hmac(Type, Key, Data, 16) of
+	Expected ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, hmac, [Type, Key, Data]}, {expected, Expected}, {got, Other}})
+    end,  
+    hmac(Type, Keys, Rest, Expects);
+
+hmac(Type, [Key | Keys], [Data| Rest], [Expected | Expects]) ->
+    case crypto:hmac(Type, Key, Data) of
+	Expected ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, hmac, [Type, Key, Data]}, {expected, Expected}, {got, Other}})
+    end,  
+    hmac(Type, Keys, Rest, Expects).
+
+hmac_increment(Type) ->
+    Key = hmac_key(Type),
+    Increments = hmac_inc(Type),
+    Expected = crypto:hmac(Type, Key, lists:flatten(Increments)),
+    State = crypto:hmac_init(Type, Key),
+    case hmac_increment(State, Increments) of
+	Expected ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, "hmac_init/update/final", [Type, Increments]}, {expected, Expected}, {got, Other}})  
+    end.
 
+hmac_increment(State, []) ->
+    crypto:hmac_final(State);
+hmac_increment(State0, [Increment | Rest]) ->
+    State = crypto:hmac_update(State0, Increment),
+    hmac_increment(State, Rest).
+
+block_cipher({Type, Key,  PlainText}) ->
+    Plain = iolist_to_binary(PlainText),
+    CipherText = crypto:block_encrypt(Type, Key, PlainText),
+    case crypto:block_decrypt(Type, Key, CipherText) of
+	Plain ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, block_decrypt, [Type, Key, CipherText]}, {expected, Plain}, {got, Other}})
+    end;
+
+block_cipher({Type, Key,  IV, PlainText}) ->
+    Plain = iolist_to_binary(PlainText),
+    CipherText = crypto:block_encrypt(Type, Key, IV, PlainText),
+    case crypto:block_decrypt(Type, Key, IV, CipherText) of
+	Plain ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, block_decrypt, [Type, Key, IV, CipherText]}, {expected, Plain}, {got, Other}})
+    end.
 
-%%
-%%
-strong_rand_test(doc) ->
-    "strong_rand_mpint and strong_random_bytes testing";
-strong_rand_test(suite) ->
-    [];
-strong_rand_test(Config) when is_list(Config) ->
-    strong_rand_aux_test(180),
-    ?line 10 = byte_size(crypto:strong_rand_bytes(10)).
-
-strong_rand_aux_test(0) ->
-    ?line t(crypto:strong_rand_mpint(0,0,0) =:= <<0,0,0,0>>),
+block_cipher_increment({Type, Key, IV, PlainTexts}) when Type == des_cbc;
+							 Type == des3_cbc;
+							 Type == aes_cbc; 
+							 Type == des_cbf
+							 ->
+     block_cipher_increment(Type, Key, IV, IV, PlainTexts, iolist_to_binary(PlainTexts), []);
+block_cipher_increment({_Type, _, _, _}) ->
     ok;
-strong_rand_aux_test(1) ->
-    ?line t(crypto:erlint(crypto:strong_rand_mpint(1,0,1)) =:= 1),
-    ?line strong_rand_aux_test(0);
-strong_rand_aux_test(N) ->
-    ?line t(sru_length(crypto:strong_rand_mpint(N,-1,0)) =< N),
-    ?line t(sru_length(crypto:strong_rand_mpint(N,0,0)) =:= N),
-    ?line t(crypto:erlint(crypto:strong_rand_mpint(N,0,1)) band 1 =:= 1),
-    ?line t(crypto:erlint(crypto:strong_rand_mpint(N,1,0)) bsr (N - 2) =:= 2#11),
-    ?line strong_rand_aux_test(N-1).
-
-sru_length(Mpint) ->
-    I = crypto:erlint(Mpint),
-    length(erlang:integer_to_list(I, 2)).
-
-%%
-%%
-%%
-%%
-rsa_verify_test(doc) ->
-    "rsa_verify testing (A ^ M % P with bignums)";
-rsa_verify_test(suite) ->
-    [];
-rsa_verify_test(Config) when is_list(Config) ->
-    ?line H = <<178,28,54,104,36,80,144,66,140,201,135,17,36,97,114,124,
-	       194,164,172,147>>,
-    ?line SigBlob = <<153,44,121,71,132,1,192,159,78,33,29,62,153,64,191,70,
-		     208,239,166,208,220,167,49,111,128,67,91,253,24,63,194,241,
-		     97,157,135,226,121,162,150,156,60,49,236,90,151,67,239,23,
-		     92,103,89,254,17,165,78,181,64,128,13,210,86,111,209,76,
-		     115,34,107,227,151,47,80,185,143,85,202,55,245,163,226,26,
-		     139,104,196,6,96,82,108,197,13,0,12,70,153,109,107,180,
-		     130,246,156,182,56,96,31,220,227,218,136,211,252,43,8,14,
-		     145,155,191,206,72,194,80,52,54,206,53,27,6,188,195,29>>,
-    ?line BadSigBlob = <<153,44,121,71,132,1,192,159,78,33,29,62,153,64,191,70,
-			208,239,166,208,220,167,49,111,128,67,91,253,24,63,194,241,
-			97,157,135,226,121,162,150,156,60,49,236,90,151,67,239,23,
-			92,103,89,254,17,165,78,181,64,128,13,210,86,111,209,76,
-			115,107,34,227,151,47,80,185,143,85,202,55,245,163,226,26,
-			139,104,196,6,96,82,108,197,13,0,12,70,153,109,107,180,
-			130,246,156,182,56,96,31,220,227,218,136,211,252,43,8,14,
-			145,155,191,206,72,194,80,52,54,206,53,27,6,188,195,29>>,
-    ?line E = <<35>>,
-    ?line N = <<0,199,209,142,191,86,92,148,103,37,250,217,175,169,109,10,
-	       130,139,34,237,174,90,97,118,7,185,57,137,252,236,177,193,
-	       228,16,62,29,153,144,64,207,152,240,152,206,136,89,64,6,
-	       3,187,89,57,241,219,88,215,75,70,120,20,145,229,37,1,
-	       67,138,204,17,39,231,249,239,116,142,169,99,149,41,65,123,
-	       26,225,133,0,41,85,77,181,35,100,162,223,92,220,207,50,
-	       63,168,193,171,174,199,23,214,201,63,157,76,125,6,54,73,
-	       76,89,40,33,147,208,189,76,98,24,61,8,10,110,165,119,165>>,
-    ?line Nbad = <<0,199,209,142,191,86,92,148,103,37,250,217,175,169,109,10,
-		  130,139,34,237,174,90,97,118,7,185,57,137,252,236,177,193,
-		  228,16,62,29,153,144,64,207,152,240,152,206,136,89,64,6,
-		  3,187,89,57,241,219,88,215,75,70,120,20,145,229,37,1,
-		  67,138,204,17,39,231,249,239,116,142,169,99,149,41,65,123,
-		  26,225,133,0,41,85,77,181,35,100,162,223,92,220,207,50,
-		  63,168,193,171,174,199,23,214,201,63,157,76,125,6,54,73,
-		  76,89,40,33,147,189,208,76,98,24,61,8,10,110,165,119,165>>,
-    ?line Ebad = <<77>>,
-    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(SigBlob),
-			      [sized_binary(E), sized_binary(N)]), true),
-    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(SigBlob),
-			      [sized_binary(Ebad), sized_binary(N)]), false),
-    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(SigBlob),
-			      [sized_binary(E), sized_binary(Nbad)]), false),
-    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(BadSigBlob),
-			      [sized_binary(E), sized_binary(N)]), false).
-
-%%
-%%
-dsa_verify_test(doc) ->
-    "dsa_verify testing (A ^ M % P with bignums)";
-dsa_verify_test(suite) ->
-    [];
-dsa_verify_test(Config) when is_list(Config) ->
-    ?line Msg = <<48,130,2,245,160,3,2,1,2,2,1,1,48,9,6,7,42,134,72,206,56,4,3,48,
-		 58,49,11,48,9,6,3,85,4,6,19,2,85,83,49,26,48,24,6,3,85,4,10,19,17,
-		 84,101,115,116,32,67,101,114,116,105,102,105,99,97,116,101,115,49,
-		 15,48,13,6,3,85,4,3,19,6,68,83,65,32,67,65,48,30,23,13,48,49,48,
-		 52,49,57,49,52,53,55,50,48,90,23,13,49,49,48,52,49,57,49,52,53,55,
-		 50,48,90,48,93,49,11,48,9,6,3,85,4,6,19,2,85,83,49,26,48,24,6,3,
-		 85,4,10,19,17,84,101,115,116,32,67,101,114,116,105,102,105,99,97,
-		 116,101,115,49,50,48,48,6,3,85,4,3,19,41,86,97,108,105,100,32,68,
-		 83,65,32,83,105,103,110,97,116,117,114,101,115,32,69,69,32,67,101,
-		 114,116,105,102,105,99,97,116,101,32,84,101,115,116,52,48,130,1,
-		 182,48,130,1,43,6,7,42,134,72,206,56,4,1,48,130,1,30,2,129,129,0,
-		 228,139,175,64,140,21,215,61,124,238,3,150,18,104,193,32,5,232,23,
-		 202,158,116,101,75,154,84,151,42,120,51,218,165,197,114,234,52,
-		 179,148,104,66,213,27,253,119,240,168,66,158,100,147,144,182,194,
-		 2,49,70,19,122,3,105,204,152,45,86,157,94,35,95,40,191,173,127,15,
-		 208,105,149,98,92,26,7,42,94,140,115,73,126,253,18,34,142,85,229,
-		 86,233,174,114,41,150,135,8,39,215,119,67,240,134,184,9,10,27,20,
-		 165,230,3,230,69,121,77,233,250,83,95,193,9,189,126,197,195,2,21,
-		 0,128,63,228,252,243,76,229,62,203,15,23,10,42,84,108,208,103,108,
-		 13,59,2,129,128,102,212,22,138,32,173,254,209,50,159,165,127,167,
-		 179,208,234,119,63,235,108,162,228,41,216,216,188,33,221,154,247,
-		 204,229,180,119,77,223,236,218,162,140,156,117,18,90,31,254,102,
-		 211,17,194,239,132,67,236,169,136,110,76,186,76,63,53,150,199,103,
-		 252,153,189,15,153,41,19,145,78,216,2,174,254,107,175,80,86,170,
-		 47,30,181,42,200,238,34,71,37,120,107,33,221,20,63,206,240,16,129,
-		 247,150,29,156,65,187,94,68,146,93,46,198,30,184,205,105,200,143,
-		 63,59,62,208,79,162,206,217,3,129,132,0,2,129,128,15,83,40,172,56,
-		 47,61,243,17,97,65,195,61,167,214,122,247,246,1,50,211,33,113,16,
-		 20,213,195,62,77,235,25,162,140,175,158,8,61,65,10,255,204,162,71,
-		 130,122,86,161,163,253,236,178,139,183,57,181,202,160,25,133,130,
-		 155,150,104,168,187,107,186,144,164,225,173,101,182,68,49,210,30,
-		 34,47,83,65,79,250,156,248,47,232,44,67,36,22,126,43,216,100,247,
-		 100,250,240,121,72,29,185,2,109,144,54,204,235,54,15,242,57,171,
-		 125,39,236,247,71,111,221,51,196,126,77,238,36,87,163,107,48,105,
-		 48,29,6,3,85,29,14,4,22,4,20,179,51,215,81,162,4,13,68,251,157,64,
-		 241,18,98,113,176,83,246,105,13,48,31,6,3,85,29,35,4,24,48,22,128,
-		 20,116,21,213,36,28,189,94,101,136,31,225,139,9,126,127,234,25,72,
-		 78,97,48,23,6,3,85,29,32,4,16,48,14,48,12,6,10,96,134,72,1,101,3,
-		 2,1,48,1,48,14,6,3,85,29,15,1,1,255,4,4,3,2,6,192>>,
-
-    ?line SigBlob = <<48,45,2,21,0,140,167,200,210,153,212,64,155,249,33,146,104,243,
-		     39,38,9,115,162,89,24,2,20,76,254,31,128,187,48,128,215,216,
-		     112,198,78,118,160,217,157,180,246,64,234>>,
-    ?line P_p = 157224271412839155721795253728878055347359513988016145491388196653004661857517720927482198111104095793441029858267073789634147217022008635826863307553453131345099940951090826856271796188522037524757740796268675508118348391218066949174594918958269259937813776150149068811425194955973128428675945283593831134219,
-    ?line Q_p = 1181895316321540581845959276009400765315408342791,
-    ?line G_p = 143872196713149000950547166575757355261637863805587906227228163275557375159769599033632918292482002186641475268486598023281100659643528846513898847919251032731261718358900479488287933293278745715922865499005559197328388506945134386346185262919258658109015074718441639029135304654725637911172671711310801418648,
-    
-    ?line Key = 12603618348903387232593303690286336220738319446775939686476278478034365380027994899970214309288018488811754534229198764622077544117034174589418477472887827980332636062691833965078594576024299807057520016043084384987871640003684704483975314128362610573625803532737054022545217931847268776098203204571431581966,
-    
-    ValidKey = [crypto:mpint(P_p), 
-		crypto:mpint(Q_p), 
-		crypto:mpint(G_p),
-		crypto:mpint(Key)
-	       ],
-    
-    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(SigBlob),
-			      ValidKey), true),
-
-    BadMsg  = one_bit_wrong(Msg),
-    ?line m(my_dss_verify(sized_binary(BadMsg), sized_binary(SigBlob),
-			      ValidKey), false),
-    BadSig = one_bit_wrong(SigBlob),
-    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(BadSig),
-			      ValidKey), false),
-    SizeErr = size(SigBlob) - 13,
-    
-    BadArg = (catch my_dss_verify(sized_binary(Msg), <<SizeErr:32, SigBlob/binary>>,
-				      ValidKey)),
-    badarg = case element(1,element(2,BadArg)) of
-		 badarg -> badarg;
-		 function_clause -> badarg;
-		 X -> X
-	     end,
-    InValidKey = [crypto:mpint(P_p), 
-		  crypto:mpint(Q_p), 
-		  crypto:mpint(G_p),
-		  crypto:mpint(Key+17)
-		 ],
-    
-    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(SigBlob),
-			      InValidKey), false).
-
-
-one_bit_wrong(List) when is_list(List) ->
-    lists:map(fun(Bin) -> one_bit_wrong(Bin) end, List);
-one_bit_wrong(Bin) ->
-    Half = size(Bin) div 2,
-    <<First:Half/binary, Byte:8, Last/binary>> = Bin,
-    <<First/binary, (Byte+1):8, Last/binary>>.
-
-
-%%
-%%  Sign tests
-
-rsa_sign_test(doc) ->
-    "rsa_sign testing";
-rsa_sign_test(suite) ->
-    [];
-rsa_sign_test(Config) when is_list(Config) ->
-    PubEx  = 65537,
-    PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
-    Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
-    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
-	   "09812312908312378623487263487623412039812 huagasd">>,
-    
-    PrivKey = [PubEx, Mod, PrivEx],
-    PubKey  = [PubEx, Mod],
-    PubKeyMpint = map_int_to_mpint(PubKey),
-    Sig1 = crypto:rsa_sign(sized_binary(Msg), map_int_to_mpint(PrivKey)),
-    Sig1 = crypto:sign(rsa, sha, Msg, PrivKey),
-    true = crypto:rsa_verify(sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
-    true = crypto:verify(rsa, sha, Msg, Sig1, PubKey),
-    
-    Sig2 = crypto:rsa_sign(md5, sized_binary(Msg), map_int_to_mpint(PrivKey)),
-    Sig2 = crypto:sign(rsa, md5, Msg, PrivKey),
-    true = crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig2), PubKeyMpint),
-    true = crypto:verify(rsa, md5, Msg, Sig2, PubKey),
-    
-    false = (Sig1 =:= Sig2),
-    false = crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
-    false = crypto:verify(rsa, md5, Msg, Sig1, PubKey),
-    true = crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
-    true = crypto:verify(rsa, sha, Msg, Sig1, PubKey),
-
+block_cipher_increment({_,_,_}) ->
     ok.
-map_int_to_mpint(List) ->
-    lists:map(fun(E) -> crypto:mpint(E) end, List).
-
-rsa_sign_hash_test(doc) ->
-    "rsa_sign_hash testing";
-rsa_sign_hash_test(suite) ->
-    [];
-rsa_sign_hash_test(Config) when is_list(Config) ->
-    PubEx  = 65537,
-    PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
-    Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
-    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
-	   "09812312908312378623487263487623412039812 huagasd">>,
-
-    PrivKey = [crypto:mpint(PubEx), crypto:mpint(Mod), crypto:mpint(PrivEx)],
-    PubKey  = [crypto:mpint(PubEx), crypto:mpint(Mod)],
-    MD5 = crypto:md5(sized_binary(Msg)),
-    SHA = crypto:sha(sized_binary(Msg)),
-    ?line Sig1 = crypto:rsa_sign(sha, {digest,SHA}, PrivKey),
-    ?line m(crypto:rsa_verify(sha, {digest,SHA}, sized_binary(Sig1),PubKey), true),
-
-    ?line Sig2 = crypto:rsa_sign(md5, {digest,MD5}, PrivKey),
-    ?line m(crypto:rsa_verify(md5, {digest,MD5}, sized_binary(Sig2),PubKey), true),
-
-    ?line m(Sig1 =:= Sig2, false),
-    ?line m(crypto:rsa_verify(md5, {digest,MD5}, sized_binary(Sig1),PubKey), false),
-    ?line m(crypto:rsa_verify(sha, {digest,SHA}, sized_binary(Sig2),PubKey), false),
+block_cipher_increment(Type, Key, IV0, _IV, [], Plain, Acc) ->
+    CipherText = iolist_to_binary(lists:reverse(Acc)),
+    case crypto:block_decrypt(Type, Key, IV0, CipherText) of
+	Plain ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, block_decrypt, [Type, Key, IV0, CipherText]}, {expected, Plain}, {got, Other}})
+    end;
+block_cipher_increment(Type, Key, IV0, IV, [PlainText | PlainTexts], Plain, Acc) ->
+    CipherText = crypto:block_encrypt(Type, Key, IV, PlainText),
+    NextIV = crypto:next_iv(Type, CipherText),
+    block_cipher_increment(Type, Key, IV0, NextIV, PlainTexts, Plain, [CipherText | Acc]).
+
+stream_cipher({Type, Key, PlainText}) ->
+    Plain = iolist_to_binary(PlainText),
+    State = crypto:stream_init(Type, Key),
+    {_, CipherText} = crypto:stream_encrypt(State, PlainText),
+    case crypto:stream_decrypt(State, CipherText) of
+	{_, Plain} ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, stream_decrypt, [State, CipherText]}, {expected, PlainText}, {got, Other}})
+    end;
+stream_cipher({Type, Key, IV, PlainText}) ->
+    Plain = iolist_to_binary(PlainText),
+    State = crypto:stream_init(Type, Key, IV),
+    {_, CipherText} = crypto:stream_encrypt(State, PlainText),
+    case crypto:stream_decrypt(State, CipherText) of
+	{_, Plain} ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, stream_decrypt, [State, CipherText]}, {expected, PlainText}, {got, Other}})
+    end.
 
-    ok.
+stream_cipher_incment({Type, Key, PlainTexts}) ->
+    State = crypto:stream_init(Type, Key),
+    stream_cipher_incment(State, State, PlainTexts, [], iolist_to_binary(PlainTexts));
+stream_cipher_incment({Type, Key, IV, PlainTexts}) ->
+    State = crypto:stream_init(Type, Key, IV),
+    stream_cipher_incment(State, State, PlainTexts, [], iolist_to_binary(PlainTexts)).
+
+stream_cipher_incment(_State, OrigState, [], Acc, Plain) ->
+    CipherText = iolist_to_binary(lists:reverse(Acc)),
+    case crypto:stream_decrypt(OrigState, CipherText) of
+	{_, Plain} ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, stream_decrypt, [OrigState, CipherText]}, {expected, Plain}, {got, Other}})
+    end;
+stream_cipher_incment(State0, OrigState, [PlainText | PlainTexts], Acc, Plain) ->
+    {State, CipherText} = crypto:stream_encrypt(State0, PlainText),
+    stream_cipher_incment(State, OrigState, PlainTexts, [CipherText | Acc], Plain).
+	
+do_sign_verify({Type, Hash, Public, Private, Msg}) ->
+    Signature = crypto:sign(Type, Hash, Msg, Private),
+    case crypto:verify(Type, Hash, Msg, Signature, Public) of
+	true ->
+	    negative_verify(Type, Hash, Msg, <<10,20>>, Public);
+	false ->
+	    ct:fail({{crypto, verify, [Type, Hash, Msg, Signature, Public]}})
+    end. 
 
-dsa_sign_test(doc) ->
-    "dsa_sign testing";
-dsa_sign_test(suite) ->
-    [];
-dsa_sign_test(Config) when is_list(Config) ->
-    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
-	   "09812312908312378623487263487623412039812 huagasd">>,
-
-    PubKey = _Y = 25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978,
-    PrivKey = _X = 441502407453038284293378221372000880210588566361,
-    ParamP = 109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797,
-    ParamQ = 1349199015905534965792122312016505075413456283393,
-    ParamG = 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669,
-
-    Params = [crypto:mpint(ParamP), crypto:mpint(ParamQ), crypto:mpint(ParamG)],
-    ?line Sig1 = my_dss_sign(sized_binary(Msg), Params ++ [crypto:mpint(PrivKey)]),
-    
-    ?line m(my_dss_verify(sized_binary(Msg), Sig1, 
-			      Params ++ [crypto:mpint(PubKey)]), true),
-    
-    ?line m(my_dss_verify(sized_binary(one_bit_wrong(Msg)), Sig1, 
-			      Params ++ [crypto:mpint(PubKey)]), false),
-    
-    ?line m(my_dss_verify(sized_binary(Msg), one_bit_wrong(Sig1), 
-			      Params ++ [crypto:mpint(PubKey)]), false),
+negative_verify(Type, Hash, Msg, Signature, Public) ->
+    case crypto:verify(Type, Hash, Msg, Signature, Public) of
+	true ->
+	    ct:fail({{crypto, verify, [Type, Hash, Msg, Signature, Public]}, should_fail});
+	false ->
+	    ok
+    end.
 
-    %%?line Bad = crypto:dss_sign(sized_binary(Msg), [Params, crypto:mpint(PubKey)]),
+do_public_encrypt({Type, Public, Private, Msg, Padding}) ->
+    PublicEcn = crypto:public_encrypt(Type, Msg, Public, Padding),
+    case crypto:private_decrypt(Type, PublicEcn, Private, Padding) of
+	Msg ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, private_decrypt, [Type, PublicEcn, Private, Padding]}, {expected, Msg}, {got, Other}})
+    end. 
+do_private_encrypt({Type, Public, Private, Msg, Padding}) ->
+    PrivEcn = crypto:private_encrypt(Type, Msg, Private, Padding),
+    case crypto:public_decrypt(Type, PrivEcn, Public, Padding) of
+	Msg ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, public_decrypt, [Type, PrivEcn, Public, Padding]}, {expected, Msg}, {got, Other}})
+    end.
+     
+do_generate_compute({srp = Type, UserPrivate, UserGenParams, UserComParams,
+		     HostPublic, HostPrivate, HostGenParams, HostComParam, SessionKey}) ->
+    {UserPublic, UserPrivate} = crypto:generate_key(Type, UserGenParams, UserPrivate),
+    {HostPublic, HostPrivate} = crypto:generate_key(Type, HostGenParams, HostPrivate),
+    SessionKey = crypto:compute_key(Type, HostPublic, {UserPublic, UserPrivate},
+     				    UserComParams),
+    SessionKey = crypto:compute_key(Type, UserPublic, {HostPublic, HostPrivate},
+				    HostComParam);
+do_generate_compute({dh, P, G}) ->
+    {UserPub, UserPriv} = crypto:generate_key(dh, [P, G]),
+    {HostPub, HostPriv} = crypto:generate_key(dh, [P, G]),
+    SharedSecret = crypto:compute_key(dh, HostPub, UserPriv, [P, G]),
+    SharedSecret = crypto:compute_key(dh, UserPub, HostPriv, [P, G]).
     
-    ok.
-
-dsa_sign_hash_test(doc) ->
-    "dsa_sign_hash testing";
-dsa_sign_hash_test(suite) ->
-    [];
-dsa_sign_hash_test(Config) when is_list(Config) ->
-    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
-	   "09812312908312378623487263487623412039812 huagasd">>,
-    SHA = crypto:sha(sized_binary(Msg)),
-
-    PubKey = _Y = 25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978,
-    PrivKey = _X = 441502407453038284293378221372000880210588566361,
-    ParamP = 109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797,
-    ParamQ = 1349199015905534965792122312016505075413456283393,
-    ParamG = 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669,
-
-    Params = [crypto:mpint(ParamP), crypto:mpint(ParamQ), crypto:mpint(ParamG)],
-    ?line Sig1 = crypto:dss_sign(sha, {digest,SHA}, Params ++ [crypto:mpint(PrivKey)]),
+do_compute({ecdh = Type, Pub, Priv, Curve, SharedSecret}) ->
+    Secret = crypto:bytes_to_integer(crypto:compute_key(Type, Pub, Priv, Curve)),
+     case Secret of
+	 SharedSecret ->
+	     ok;
+	 Other ->
+	     ct:fail({{crypto, compute_key, [Type, Pub, Priv, Curve]}, {expected, SharedSecret}, {got, Other}})
+     end.
 
-    ?line m(crypto:dss_verify(none, SHA, sized_binary(Sig1),
-			      Params ++ [crypto:mpint(PubKey)]), true),
+hexstr2bin(S) ->
+    list_to_binary(hexstr2list(S)).
 
-    ?line m(crypto:dss_verify(sized_binary(one_bit_wrong(Msg)), sized_binary(Sig1),
-			      Params ++ [crypto:mpint(PubKey)]), false),
+hexstr2list([X,Y|T]) ->
+    [mkint(X)*16 + mkint(Y) | hexstr2list(T)];
+hexstr2list([]) ->
+    [].
+mkint(C) when $0 =< C, C =< $9 ->
+    C - $0;
+mkint(C) when $A =< C, C =< $F ->
+    C - $A + 10;
+mkint(C) when $a =< C, C =< $f ->
+    C - $a + 10.
 
-    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(one_bit_wrong(Sig1)),
-			      Params ++ [crypto:mpint(PubKey)]), false),
+is_supported(cipher) ->
+   true;
+is_supported(Group) ->
+    lists:member(Group, lists:append([Algo ||  {_, Algo}  <- crypto:supports()])). 
+
+block_iolistify(Blocks) ->
+    lists:map(fun do_block_iolistify/1, Blocks).
+stream_iolistify(Streams) ->
+    lists:map(fun do_stream_iolistify/1, Streams).
+
+do_stream_iolistify({Type, Key, PlainText}) ->
+    {Type, iolistify(Key), iolistify(PlainText)};
+do_stream_iolistify({Type, Key, IV, PlainText}) ->
+    {Type, iolistify(Key), IV, iolistify(PlainText)}.
+
+do_block_iolistify({des_cbc = Type, Key, IV, PlainText}) ->
+    {Type, Key, IV, des_iolistify(PlainText)};
+do_block_iolistify({des3_cbc = Type, Key, IV, PlainText}) ->
+    {Type, Key, IV, des_iolistify(PlainText)};
+do_block_iolistify({des3_cbf = Type, Key, IV, PlainText}) ->
+    {Type, Key, IV, des_iolistify(PlainText)};
+do_block_iolistify({Type, Key, PlainText}) ->
+    {Type, iolistify(Key), iolistify(PlainText)};
+do_block_iolistify({Type, Key, IV, PlainText}) ->
+    {Type, iolistify(Key), IV, iolistify(PlainText)}.
+
+iolistify(<<"Test With Truncation">>)->
+    %% Do not iolistify as it spoils this special case
+    <<"Test With Truncation">>;
+iolistify(Msg)->    
+    Length = erlang:byte_size(Msg),
+    Split = Length div 2,
+    List0 = binary_to_list(Msg),
+   case lists:split(Split, List0) of
+       {[Element | List1], List2} ->
+	   [[Element], List1, List2];
+       {List1, List2}->
+	   [List1, List2]
+   end.
+
+des_iolistify(Msg) ->    
+    des_iolist(erlang:byte_size(Msg) div 8, Msg, []).
+
+des_iolist(1, Msg, Acc) ->
+    lists:reverse([Msg | Acc]);
+des_iolist(Split, Msg, Acc) ->
+    <<Part:8/binary, Rest/binary>> = Msg,
+    des_iolist(Split-1, Rest, [Part | Acc]).
+
+%%--------------------------------------------------------------------
+mod_pow_aux_test(_, _, _, 0) ->
+    ok;
+mod_pow_aux_test(B, E, M, N) ->
+    Result = crypto:bytes_to_integer(crypto:mod_pow(B, E, M)),
+    Result = ipow(B, E, M),
+    mod_pow_aux_test(B, E*E+1, M*M+1, N-1).
 
-    %%?line Bad = crypto:dss_sign(sized_binary(Msg), [Params, crypto:mpint(PubKey)]),
+%% mod_exp in erlang (copied from jungerl's ssh_math.erl)
+ipow(A, B, M) when M > 0, B >= 0 ->
+    if A == 1 -> 
+ 	    1;
+       true -> 
+ 	    ipow(A, B, M, 1)
+    end.
 
-    ok.
+ipow(A, 1, M, Prod) ->
+    (A*Prod) rem M;
+ipow(_A, 0, _M, Prod) ->
+    Prod;
+ipow(A, B, M, Prod)  ->
+    B1 = B bsr 1,
+    A1 = (A*A) rem M,
+    if B - B1 == B1 ->
+	    ipow(A1, B1, M, Prod);
+       true ->
+	    ipow(A1, B1, M, (A*Prod) rem M)
+    end.
 
+zero_bin(N) when is_integer(N) ->
+    N8 = N * 8,
+    <<0:N8/integer>>;
+zero_bin(B) when is_binary(B) ->
+    zero_bin(size(B)).
+xor_bytes(Bin1, Bin2) when is_binary(Bin1), is_binary(Bin2) ->
+    L1 = binary_to_list(Bin1),
+    L2 = binary_to_list(Bin2),
+    list_to_binary(xor_bytes(L1, L2));
+xor_bytes(L1, L2) ->
+    xor_bytes(L1, L2, []).
 
-rsa_encrypt_decrypt(doc) ->
-    ["Test rsa_public_encrypt and rsa_private_decrypt functions."];
-rsa_encrypt_decrypt(suite) -> [];
-rsa_encrypt_decrypt(Config) when is_list(Config) ->
-    PubEx  = 65537,
-    PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
-    Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
-    
-    PrivKey = [PubEx, Mod, PrivEx],
-    PubKey  = [PubEx, Mod],
+xor_bytes([], [], Acc) ->
+    lists:reverse(Acc);
+xor_bytes([N1 | Tl1], [N2 | Tl2], Acc) ->
+    xor_bytes(Tl1, Tl2, [N1 bxor N2 | Acc]).
 
-    Msg = <<"7896345786348 Asldi">>,
+%%--------------------------------------------------------------------
+%% Test data ------------------------------------------------
+%%--------------------------------------------------------------------
+group_config(md4 = Type, Config) ->
+    Msgs = rfc_1321_msgs(),
+    Digests = rfc_1321_md4_digests(),
+    [{hash, {Type, Msgs, Digests}} | Config];
+group_config(md5 = Type, Config) ->
+    Msgs = rfc_1321_msgs(),
+    Digests = rfc_1321_md5_digests(),
+    Keys = rfc_2202_md5_keys(),
+    Data = rfc_2202_msgs(),
+    Hmac = rfc_2202_hmac_md5(),
+    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}} | Config];
+group_config(ripemd160 = Type, Config) ->
+    Msgs = ripemd160_msgs(),
+    Digests = ripemd160_digests(),
+   [{hash, {Type, Msgs, Digests}} | Config];
+group_config(sha = Type, Config) ->
+    Msgs = [rfc_4634_test1(), rfc_4634_test2_1()], 
+    Digests = rfc_4634_sha_digests(),
+    Keys = rfc_2202_sha_keys(),
+    Data = rfc_2202_msgs(),
+    Hmac = rfc_2202_hmac_sha(),
+    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}} | Config];
+group_config(sha224 = Type, Config) ->
+    Msgs = [rfc_4634_test1(), rfc_4634_test2_1()], 
+    Digests = rfc_4634_sha224_digests(),
+    Keys = rfc_4231_keys(),
+    Data = rfc_4231_msgs(),
+    Hmac = rfc4231_hmac_sha224(),
+   [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+group_config(sha256 = Type, Config) ->
+    Msgs =   [rfc_4634_test1(), rfc_4634_test2_1()], 
+    Digests = rfc_4634_sha256_digests(),
+    Keys = rfc_4231_keys(),
+    Data = rfc_4231_msgs(),
+    Hmac = rfc4231_hmac_sha256(),
+    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+group_config(sha384 = Type, Config) ->
+    Msgs =  [rfc_4634_test1(), rfc_4634_test2()],
+    Digests = rfc_4634_sha384_digests(),
+    Keys = rfc_4231_keys(),
+    Data = rfc_4231_msgs(),
+    Hmac = rfc4231_hmac_sha384(),
+    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+group_config(sha512 = Type, Config) ->
+    Msgs =  [rfc_4634_test1(), rfc_4634_test2()],
+    Digests = rfc_4634_sha512_digests(),
+    Keys = rfc_4231_keys(),
+    Data = rfc_4231_msgs(),
+    Hmac = rfc4231_hmac_sha512(),
+    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+group_config(rsa = Type, Config) ->
+    Msg = rsa_plain(),
+    Public = rsa_public(),
+    Private = rsa_private(),
+    SignVerify = [{Type, md5, Public, Private, Msg},
+		  {Type, sha, Public, Private, Msg},
+		  {Type, sha224,  Public, Private,Msg},
+		  {Type, sha256,  Public, Private,Msg} 
+		  %% {Type, sha384,  Public, Private,Msg},
+		  %% {Type, sha512, Public, Private, Msg}
+		 ],
+    MsgPubEnc = <<"7896345786348 Asldi">>,
+    PubPrivEnc = [{rsa, Public, Private, MsgPubEnc, rsa_pkcs1_padding}
+		  %%{rsa, Public, Private, MsgPubEnc, rsa_pkcs1_oaep_padding}
+		  %%{rsa, Public, Private, MsgPubEnc, rsa_no_padding}
+		 ],
+    [{sign_verify, SignVerify}, {pub_priv_encrypt, PubPrivEnc} | Config];
+group_config(dss = Type, Config) ->
+    Msg = dss_plain(),
+    Public = dss_params() ++ [dss_public()], 
+    Private = dss_params() ++ [dss_private()], 
+    SignVerify = [{Type, sha, Public, Private, Msg}],
+    [{sign_verify, SignVerify} | Config];
+
+group_config(ecdsa = Type, Config) ->
+    {Private, Public} = ec_key_named(),
+    Msg = ec_msg(),
+    SignVerify = [{Type, sha, Public, Private, Msg}],
+    [{sign_verify, SignVerify} | Config];
+group_config(srp, Config) ->
+    GenerateCompute = [srp3(), srp6(), srp6a()],
+    [{generate_compute, GenerateCompute} | Config];
+group_config(ecdh, Config) ->
+    Compute = [ecdh()],
+    [{compute, Compute} | Config];
+group_config(dh, Config) ->
+    GenerateCompute = [dh()],
+    [{generate_compute, GenerateCompute} | Config];
+group_config(des_cbc, Config) ->
+    Block = des_cbc(),
+    [{block, Block} | Config];
+group_config(des_cfb, Config) ->
+    Block = des_cfb(),
+    [{block, Block} | Config];
+group_config(des3_cbc, Config) ->
+    Block = des3_cbc(),
+    [{block, Block} | Config];
+group_config(des3_cbf, Config) ->
+    Block = des3_cbf(),
+    [{block, Block} | Config];
+group_config(rc2_cbc, Config) ->
+    Block = rc2_cbc(),
+    [{block, Block} | Config];
+group_config(aes_cbc128, Config) ->
+    Block = aes_cbc128(),
+    [{block, Block} | Config];
+group_config(aes_cbc256, Config) ->
+    Block = aes_cbc256(),
+    [{block, Block} | Config];
+group_config(aes_cfb128, Config) ->
+    Block = aes_cfb128(),
+    [{block, Block} | Config];
+group_config(blowfish_cbc, Config) ->
+    Block = blowfish_cbc(),
+    [{block, Block} | Config];
+group_config(blowfish_ecb, Config) ->
+    Block = blowfish_ecb(),
+    [{block, Block} | Config];
+group_config(blowfish_cfb64, Config) ->
+    Block = blowfish_cfb64(),
+    [{block, Block} | Config];
+group_config(blowfish_ofb64, Config) ->
+    Block = blowfish_ofb64(),
+    [{block, Block} | Config];
+group_config(rc4, Config) ->
+    Stream = rc4(),
+    [{stream, Stream} | Config];
+group_config(aes_ctr, Config) ->
+    Stream = aes_ctr(),
+    [{stream, Stream} | Config];
+group_config(_, Config) ->
+    Config.
 
-    ?line PKCS1 = rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_padding),
-    ?line PKCS1Dec = rsa_private_decrypt(PKCS1, PrivKey, rsa_pkcs1_padding),
-    io:format("PKCS1Dec ~p~n",[PKCS1Dec]),
-    ?line Msg = PKCS1Dec,
-    
-    ?line OAEP = rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_oaep_padding),
-    ?line Msg = rsa_private_decrypt(OAEP, PrivKey, rsa_pkcs1_oaep_padding),
-
-    <<Msg2Len:32,_/binary>> = crypto:mpint(Mod),
-    Msg2 = list_to_binary(lists:duplicate(Msg2Len-1, $X)),
-    ?line NoPad = rsa_public_encrypt(Msg2, PubKey, rsa_no_padding),
-    ?line NoPadDec = rsa_private_decrypt(NoPad, PrivKey, rsa_no_padding),
-    ?line NoPadDec = Msg2,
-    
-    ShouldBeError = (catch rsa_public_encrypt(Msg, PubKey, rsa_no_padding)),
-    ?line {'EXIT', {encrypt_failed,_}} = ShouldBeError,
-    
-%%     ?line SSL = rsa_public_encrypt(Msg, PubKey, rsa_sslv23_padding),
-%%     ?line Msg = rsa_private_decrypt(SSL, PrivKey, rsa_sslv23_padding),
-
-    ?line PKCS1_2 = rsa_private_encrypt(Msg, PrivKey, rsa_pkcs1_padding),
-    ?line PKCS1_2Dec = rsa_public_decrypt(PKCS1_2, PubKey, rsa_pkcs1_padding),
-    io:format("PKCS2Dec ~p~n",[PKCS1_2Dec]),
-    ?line Msg = PKCS1_2Dec,
-
-    ?line PKCS1_3 = rsa_private_encrypt(Msg2, PrivKey, rsa_no_padding),
-    ?line PKCS1_3Dec = rsa_public_decrypt(PKCS1_3, PubKey, rsa_no_padding),
-    io:format("PKCS2Dec ~p~n",[PKCS1_3Dec]),
-    ?line Msg2 = PKCS1_3Dec,
+rfc_1321_msgs() ->
+    [<<"">>, 
+     <<"a">>,
+     <<"abc">>, 
+     <<"message digest">>,
+     <<"abcdefghijklmnopqrstuvwxyz">>,
+     <<"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789">>,
+     <<"12345678901234567890123456789012345678901234567890123456789012345678901234567890">>
+    ].
+
+rfc_1321_md4_digests() ->
+    [hexstr2bin("31d6cfe0d16ae931b73c59d7e0c089c0"),
+     hexstr2bin("bde52cb31de33e46245e05fbdbd6fb24"),
+     hexstr2bin("a448017aaf21d8525fc10ae87aa6729d"),
+     hexstr2bin("d9130a8164549fe818874806e1c7014b"),
+     hexstr2bin("d79e1c308aa5bbcdeea8ed63df412da9"),
+     hexstr2bin("043f8582f241db351ce627e153e7f0e4"),
+     hexstr2bin("e33b4ddc9c38f2199c3e7b164fcc0536")].
+
+rfc_1321_md5_digests() ->
+    [hexstr2bin("d41d8cd98f00b204e9800998ecf8427e"),
+     hexstr2bin("0cc175b9c0f1b6a831c399e269772661"),
+     hexstr2bin("900150983cd24fb0d6963f7d28e17f72"),
+     hexstr2bin("f96b697d7cb7938d525a2f31aaf161d0"),
+     hexstr2bin("c3fcd3d76192e4007dfb496cca67e13b"),
+     hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f"),
+     hexstr2bin("57edf4a22be3c955ac49da2e2107b67a")].
+
+rfc_4634_test1() ->
+    <<"abc">>.
+rfc_4634_test2_1() ->
+    <<"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq">>.
+rfc_4634_test2_2a() ->
+    <<"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn">>.
+rfc_4634_test2_2b() ->
+    <<"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu">>.
+rfc_4634_test2() ->
+    A2 =rfc_4634_test2_2a(),
+    B2 = rfc_4634_test2_2b(),
+    <<A2/binary, B2/binary>>.
+ 
+rfc_4634_sha_digests()->
+     [hexstr2bin("A9993E364706816ABA3E25717850C26C9CD0D89D"),
+      hexstr2bin("84983E441C3BD26EBAAE4AA1F95129E5E54670F1")].
+rfc_4634_sha224_digests() ->
+     [hexstr2bin("23097D223405D8228642A477BDA255B32AADBCE4BDA0B3F7E36C9DA7"),
+      hexstr2bin("75388B16512776CC5DBA5DA1FD890150B0C6455CB4F58B1952522525")].
+rfc_4634_sha256_digests() ->
+    [
+     hexstr2bin("BA7816BF8F01CFEA4141"
+		"40DE5DAE2223B00361A396177A9CB410FF61F20015AD"),
+     hexstr2bin("248D6A61D20638B8"
+		"E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1")
+    ].
+rfc_4634_sha384_digests() ->
+    [hexstr2bin("CB00753F45A35E8BB5A03D699AC65007272C32AB0EDED1631A8B605A43FF5BED8086072BA1E7CC2358BAECA134C825A7"),
+     hexstr2bin("09330C33F71147E83D192FC782CD1B4753111B173B3B05D22FA08086E3B0F712FCC7C71A557E2DB966C3E9FA91746039")
+    ].
+rfc_4634_sha512_digests() -> 
+    [hexstr2bin("DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA2"
+		"0A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD"
+		"454D4423643CE80E2A9AC94FA54CA49F"),
+     hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA17299AEADB6889018501D289E4900F7E4331B99DEC4B5433AC7D329EEB6DD26545E96E55B874BE909")].
+
+ripemd160_msgs() ->
+    [<<"">>,
+     <<"a">>,
+     <<"abc">>,
+     <<"message digest">>,
+     <<"abcdefghijklmnopqrstuvwxyz">>,
+     <<"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq">>,
+     <<"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789">>
+    ].
+
+ripemd160_digests() ->
+    [hexstr2bin("9c1185a5c5e9fc54612808977ee8f548b2258d31"),
+     hexstr2bin("0bdc9d2d256b3ee9daae347be6f4dc835a467ffe"),
+     hexstr2bin("8eb208f7e05d987a9b044a8e98c6b087f15a0bfc"),
+     hexstr2bin("5d0689ef49d2fae572b881b123a85ffa21595f36"),
+     hexstr2bin("f71c27109c692c1b56bbdceb5b9d2865b3708dbc"),
+     hexstr2bin("12a053384a9c0c88e405a06c27dcf49ada62eb2b"),
+     hexstr2bin("b0e20b6e3116640286ed3a87a5713079b21f5189")
+    ].
+
+ripemd160_incr_msgs() ->
+     [<<"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefg">>,<<"hijklmnopqrstuvwxyz0123456789">>].
+ripemd160_incr_digest() ->
+    hexstr2bin("b0e20b6e3116640286ed3a87a5713079b21f5189").
+
+rfc_2202_md5_keys() ->
+    [binary:copy(<<16#0b>>, 16),
+     <<"Jefe">>,
+     binary:copy(<<16#aa>>, 16),
+     list_to_binary(lists:seq(1, 16#19)),
+     binary:copy(<<16#0c>>, 16),
+     binary:copy(<<16#aa>>, 80),
+     binary:copy(<<16#aa>>, 80)].
+
+rfc_2202_sha_keys() ->
+    [binary:copy(<<16#0b>>, 20),
+     <<"Jefe">>,
+     binary:copy(<<16#aa>>, 20),
+     list_to_binary(lists:seq(1, 16#19)),
+     binary:copy(<<16#0c>>, 20),
+     binary:copy(<<16#aa>>, 80),
+     binary:copy(<<16#aa>>, 80)].
+
+rfc_2202_msgs()->
+    [<<"Hi There">>,
+     <<"what do ya want for nothing?">>,
+     binary:copy(<<16#dd>>, 50),
+     binary:copy(<<16#cd>>, 50),
+     <<"Test With Truncation">>,
+     <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+     <<"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data">>
+    ].
+
+hmac_key(md5) ->
+    [<<"A fine speach">>, <<"by a fine man!">>];
+hmac_key(_) ->
+    hexstr2bin("00010203101112132021222330313233"
+	       "04050607141516172425262734353637"
+	       "08090a0b18191a1b28292a2b38393a3b"
+	       "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f").
+hmac_inc(_) ->
+    [<<"Sampl">>, <<"e #1">>].
+
+rfc_2202_hmac_md5() ->
+    [
+     hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d"),
+     hexstr2bin("750c783e6ab0b503eaa86e310a5db738"),
+     hexstr2bin("56be34521d144c88dbb8c733f0e8b3f6"),
+     hexstr2bin("697eaf0aca3a3aea3a75164746ffaa79"),
+     hexstr2bin("56461ef2342edc00f9bab995690efd4c"),
+     hexstr2bin("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd"),
+     hexstr2bin("6f630fad67cda0ee1fb1f562db3aa53e")
+    ].
+
+rfc_2202_hmac_sha() ->
+    [
+     hexstr2bin("b617318655057264e28bc0b6fb378c8ef146be00"),
+     hexstr2bin("effcdf6ae5eb2fa2d27416d5f184df9c259a7c79"),
+     hexstr2bin("125d7342b9ac11cd91a39af48aa17b4f63f175d3"),
+     hexstr2bin("4c9007f4026250c6bc8414f9bf50c86c2d7235da"),
+     hexstr2bin("4c1a03424b55e07fe7f27be1d58bb9324a9a5a04"),
+     hexstr2bin("aa4ae5e15272d00e95705637ce8a3b55ed402112"),
+     hexstr2bin("e8e99d0f45237d786d6bbaa7965c7808bbff1a91")
+    ].
+
+
+rfc_4231_keys() ->
+    [binary:copy(<<16#0b>>, 20),
+     <<"Jefe">>,
+     binary:copy(<<16#aa>>, 20),
+     list_to_binary(lists:seq(1, 16#19)),
+     binary:copy(<<16#0c>>, 20),
+     binary:copy(<<16#aa>>, 131),
+     binary:copy(<<16#aa>>, 131)
+    ].
     
-    ?line {'EXIT', {encrypt_failed,_}} = 
-	(catch rsa_private_encrypt(Msg, PrivKey, rsa_no_padding)),
+rfc_4231_msgs() ->
+    [<<"Hi There">>,
+     <<"what do ya want for nothing?">>,
+     binary:copy(<<16#dd>>, 50),
+     binary:copy(<<16#cd>>, 50),
+     <<"Test With Truncation">>,
+     <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+     <<"This is a test using a larger than block-size key and a larger t",
+       "han block-size data. The key needs to be hashed before being use",
+       "d by the HMAC algorithm.">>
+    ].
     
-    ok.
-
-rsa_public_encrypt(Msg, Key, Pad) ->
-    C1 = crypto:rsa_public_encrypt(Msg, Key, Pad),
-    C2 = crypto:rsa_public_encrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad),
-    {C1,C2}.
-
-rsa_public_decrypt(Msg, Key, Pad) ->
-    R = crypto:rsa_public_decrypt(Msg, Key, Pad),
-    R = crypto:rsa_public_decrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
-
-rsa_private_encrypt(Msg, Key, Pad) ->
-    R = crypto:rsa_private_encrypt(Msg, Key, Pad),
-    R = crypto:rsa_private_encrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
-
-rsa_private_decrypt({C1,C2}, Key, Pad) ->
-    R = crypto:rsa_private_decrypt(C1, Key, Pad),
-    R = crypto:rsa_private_decrypt(C2, Key, Pad),
-    R = crypto:rsa_private_decrypt(C1, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad),
-    R = crypto:rsa_private_decrypt(C2, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
-
-
-dh(doc) ->
-    ["Test dh (Diffie-Hellman) functions."];
-dh(suite) -> [];
-dh(Config) when is_list(Config) ->
-    Self = self(),
-    GenP = fun() ->
-		   %% Gen Param may take arbitrary long time to finish 
-		   %% That's not a bug in erlang crypto application.
-		   ?line DHPs = crypto:dh_generate_parameters(512,2),
-		   ?line ok = crypto:dh_check(DHPs),
-		   Self ! {param, DHPs}
-	   end,
-    Pid = spawn(GenP),
-    receive 
-	{param, DHPs} ->
-	    timer:sleep(100), 
-	    io:format("DHP ~p~n", [DHPs]),
-	    DHPs_mpint = lists:map(fun(E) -> sized_binary(E) end, DHPs),
-	    ?line {Pub1,Priv1} = crypto:generate_key(dh, DHPs),
-	    io:format("Key1:~n~p~n~p~n~n", [Pub1,Priv1]),
-	    ?line {Pub2,Priv2} = crypto:dh_generate_key(DHPs_mpint),
-	    io:format("Key2:~n~p~n~p~n~n", [Pub2,Priv2]),
-	    ?line A = crypto:compute_key(dh, Pub1, unsized_binary(Priv2), DHPs),
-	    ?line A = crypto:dh_compute_key(sized_binary(Pub1), Priv2, DHPs_mpint),
-	    timer:sleep(100),  %% Get another thread see if that triggers problem
-	    ?line B = crypto:compute_key(dh, unsized_binary(Pub2), Priv1, DHPs),
-	    ?line B = crypto:dh_compute_key(Pub2, sized_binary(Priv1), DHPs_mpint),
-	    io:format("A ~p~n",[A]),
-	    io:format("B ~p~n",[B]),
-	    ?line A = B
-    after 50000 ->
-	    io:format("Killing Param generation which took to long ~p~n",[Pid]),
-	    exit(Pid, kill)
-    end.
-
-
-ec(doc) ->
-    ["Test ec (Ecliptic Curve) functions."];
-ec(suite) -> [];
-ec(Config) when is_list(Config) ->
-    if_supported(ec, fun() -> ec_do() end).
-
-ec_do() ->
-    %% test for a name curve
-    {D2_priv, D2_pub} = crypto:generate_key(ecdh, sect113r2),
-    PrivECDH = [D2_priv, sect113r2],
-    PubECDH = [D2_pub, sect113r2],
-    %%TODO: find a published test case for a EC key
-
-    %% test for a full specified curve and public key,
-    %% taken from csca-germany_013_self_signed_cer.pem
-    PubKey = <<16#04, 16#4a, 16#94, 16#49, 16#81, 16#77, 16#9d, 16#df,
-	       16#1d, 16#a5, 16#e7, 16#c5, 16#27, 16#e2, 16#7d, 16#24,
-	       16#71, 16#a9, 16#28, 16#eb, 16#4d, 16#7b, 16#67, 16#75,
-	       16#ae, 16#09, 16#0a, 16#51, 16#45, 16#19, 16#9b, 16#d4,
-	       16#7e, 16#a0, 16#81, 16#e5, 16#5e, 16#d4, 16#a4, 16#3f,
-	       16#60, 16#7c, 16#6a, 16#50, 16#ee, 16#36, 16#41, 16#8a,
-	       16#87, 16#ff, 16#cd, 16#a6, 16#10, 16#39, 16#ca, 16#95,
-	       16#76, 16#7d, 16#ae, 16#ca, 16#c3, 16#44, 16#3f, 16#e3, 16#2c>>,
-    <<P:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
-                          16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
-			  16#72, 16#6e, 16#3b, 16#f6, 16#23, 16#d5, 16#26, 16#20,
-			  16#28, 16#20, 16#13, 16#48, 16#1d, 16#1f, 16#6e, 16#53, 16#77>>,
-    <<A:256/integer>> = <<16#7d, 16#5a, 16#09, 16#75, 16#fc, 16#2c, 16#30, 16#57,
-			  16#ee, 16#f6, 16#75, 16#30, 16#41, 16#7a, 16#ff, 16#e7,
-			  16#fb, 16#80, 16#55, 16#c1, 16#26, 16#dc, 16#5c, 16#6c,
-			  16#e9, 16#4a, 16#4b, 16#44, 16#f3, 16#30, 16#b5, 16#d9>>,
-    <<B:256/integer>> = <<16#26, 16#dc, 16#5c, 16#6c, 16#e9, 16#4a, 16#4b, 16#44,
-			  16#f3, 16#30, 16#b5, 16#d9, 16#bb, 16#d7, 16#7c, 16#bf,
-			  16#95, 16#84, 16#16, 16#29, 16#5c, 16#f7, 16#e1, 16#ce,
-			  16#6b, 16#cc, 16#dc, 16#18, 16#ff, 16#8c, 16#07, 16#b6>>,
-    BasePoint = <<16#04, 16#8b, 16#d2, 16#ae, 16#b9, 16#cb, 16#7e, 16#57,
-		  16#cb, 16#2c, 16#4b, 16#48, 16#2f, 16#fc, 16#81, 16#b7,
-		  16#af, 16#b9, 16#de, 16#27, 16#e1, 16#e3, 16#bd, 16#23,
-		  16#c2, 16#3a, 16#44, 16#53, 16#bd, 16#9a, 16#ce, 16#32,
-		  16#62, 16#54, 16#7e, 16#f8, 16#35, 16#c3, 16#da, 16#c4,
-		  16#fd, 16#97, 16#f8, 16#46, 16#1a, 16#14, 16#61, 16#1d,
-		  16#c9, 16#c2, 16#77, 16#45, 16#13, 16#2d, 16#ed, 16#8e,
-		  16#54, 16#5c, 16#1d, 16#54, 16#c7, 16#2f, 16#04, 16#69, 16#97>>,
-    <<Order:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
-			      16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
-			      16#71, 16#8c, 16#39, 16#7a, 16#a3, 16#b5, 16#61, 16#a6,
-			      16#f7, 16#90, 16#1e, 16#0e, 16#82, 16#97, 16#48, 16#56, 16#a7>>,
-    CoFactor = 1,
-    Curve = {{prime_field,P},{A,B,none},BasePoint, Order,CoFactor},
-
-    Msg = <<99,234,6,64,190,237,201,99,80,248,58,40,70,45,149,218,5,246,242,63>>,
-    Sign = crypto:sign(ecdsa, sha, Msg, PrivECDH),
-    ?line true = crypto:verify(ecdsa, sha, Msg, Sign, PubECDH),
-    ?line false = crypto:verify(ecdsa, sha, Msg, <<10,20>>, PubECDH),
-
-    ok.
-
-srp3(doc) ->
-    ["SRP-3 test vectors generated by http://srp.stanford.edu/demo/demo.html"];
-srp3(suite) -> [];
-srp3(Config) when is_list(Config) ->
+rfc4231_hmac_sha224() ->
+    [hexstr2bin("896fb1128abbdf196832107cd49df33f"
+		       "47b4b1169912ba4f53684b22"),
+     hexstr2bin("a30e01098bc6dbbf45690f3a7e9e6d0f"
+		       "8bbea2a39e6148008fd05e44"),
+     hexstr2bin("7fb3cb3588c6c1f6ffa9694d7d6ad264"
+		       "9365b0c1f65d69d1ec8333ea"),
+     hexstr2bin("6c11506874013cac6a2abc1bb382627c"
+		       "ec6a90d86efc012de7afec5a"),
+     hexstr2bin("0e2aea68a90c8d37c988bcdb9fca6fa8"),
+     hexstr2bin("95e9a0db962095adaebe9b2d6f0dbce2"
+		       "d499f112f2d2b7273fa6870e"),
+     hexstr2bin("3a854166ac5d9f023f54d517d0b39dbd"
+		"946770db9c2b95c9f6f565d1")].
+rfc4231_hmac_sha256() ->
+    [hexstr2bin("b0344c61d8db38535ca8afceaf0bf12b"
+		"881dc200c9833da726e9376c2e32cff7"),
+     hexstr2bin("5bdcc146bf60754e6a042426089575c7"
+		"5a003f089d2739839dec58b964ec3843"),
+     hexstr2bin("773ea91e36800e46854db8ebd09181a7"
+		"2959098b3ef8c122d9635514ced565fe"),
+    hexstr2bin("82558a389a443c0ea4cc819899f2083a"
+	       "85f0faa3e578f8077a2e3ff46729665b"),
+     hexstr2bin("a3b6167473100ee06e0c796c2955552b"),
+     hexstr2bin("60e431591ee0b67f0d8a26aacbf5b77f"
+		"8e0bc6213728c5140546040f0ee37f54"),
+     hexstr2bin("9b09ffa71b942fcb27635fbcd5b0e944"
+		"bfdc63644f0713938a7f51535c3a35e2")].
+
+rfc4231_hmac_sha384() ->
+    [hexstr2bin("afd03944d84895626b0825f4ab46907f"
+		"15f9dadbe4101ec682aa034c7cebc59c"
+		"faea9ea9076ede7f4af152e8b2fa9cb6"),
+     hexstr2bin("af45d2e376484031617f78d2b58a6b1b"
+		"9c7ef464f5a01b47e42ec3736322445e"
+	       "8e2240ca5e69e2c78b3239ecfab21649"),
+     hexstr2bin("88062608d3e6ad8a0aa2ace014c8a86f"
+	       "0aa635d947ac9febe83ef4e55966144b"
+		"2a5ab39dc13814b94e3ab6e101a34f27"),
+     hexstr2bin("3e8a69b7783c25851933ab6290af6ca7"
+		"7a9981480850009cc5577c6e1f573b4e"
+		"6801dd23c4a7d679ccf8a386c674cffb"),
+     hexstr2bin("3abf34c3503b2a23a46efc619baef897"),
+     hexstr2bin("4ece084485813e9088d2c63a041bc5b4"
+		"4f9ef1012a2b588f3cd11f05033ac4c6"
+		"0c2ef6ab4030fe8296248df163f44952"),
+     hexstr2bin("6617178e941f020d351e2f254e8fd32c"
+		"602420feb0b8fb9adccebb82461e99c5"
+		"a678cc31e799176d3860e6110c46523e")].
+rfc4231_hmac_sha512() ->
+    [hexstr2bin("87aa7cdea5ef619d4ff0b4241a1d6cb0"
+		"2379f4e2ce4ec2787ad0b30545e17cde"
+		"daa833b7d6b8a702038b274eaea3f4e4"
+		"be9d914eeb61f1702e696c203a126854"),
+     hexstr2bin("164b7a7bfcf819e2e395fbe73b56e0a3"
+		"87bd64222e831fd610270cd7ea250554"
+		"9758bf75c05a994a6d034f65f8f0e6fd"
+		"caeab1a34d4a6b4b636e070a38bce737"),
+     hexstr2bin("fa73b0089d56a284efb0f0756c890be9"
+		"b1b5dbdd8ee81a3655f83e33b2279d39"
+		"bf3e848279a722c806b485a47e67c807"
+		"b946a337bee8942674278859e13292fb"),
+     hexstr2bin("b0ba465637458c6990e5a8c5f61d4af7"
+		"e576d97ff94b872de76f8050361ee3db"
+		"a91ca5c11aa25eb4d679275cc5788063"
+		"a5f19741120c4f2de2adebeb10a298dd"),
+     hexstr2bin("415fad6271580a531d4179bc891d87a6"),
+     hexstr2bin("80b24263c7c1a3ebb71493c1dd7be8b4"
+		"9b46d1f41b4aeec1121b013783f8f352"
+		"6b56d037e05f2598bd0fd2215d6a1e52"
+		"95e64f73f63f0aec8b915a985d786598"),
+     hexstr2bin("e37b6a775dc87dbaa4dfa9f96e5e3ffd"
+		"debd71f8867289865df5a32d20cdc944"
+		"b6022cac3c4982b10d5eeb55c3e4de15"
+		"134676fb6de0446065c97440fa8c6a58")].
+des_cbc() ->
+    [{des_cbc, 
+     hexstr2bin("0123456789abcdef"), 
+     hexstr2bin("1234567890abcdef"),
+     <<"Now is the time for all ">> }].
+      
+des_cfb() ->
+    [{des_cfb, 
+     hexstr2bin("0123456789abcdef"),
+     hexstr2bin("1234567890abcdef"),
+     <<"Now is the">>}].
+
+des3_cbc() ->
+    [{des3_cbc,
+     [hexstr2bin("0123456789abcdef"), 
+      hexstr2bin("fedcba9876543210"),
+      hexstr2bin("0f2d4b6987a5c3e1")],
+     hexstr2bin("1234567890abcdef"),
+     <<"Now is the time for all ">>
+     }].
+
+des3_cbf() ->
+    [{des3_cbf,
+     [hexstr2bin("0123456789abcdef"), 
+      hexstr2bin("fedcba9876543210"),
+      hexstr2bin("0f2d4b6987a5c3e1")],
+     hexstr2bin("1234567890abcdef"),
+     <<"Now is the time for all ">>
+     }].
+
+rc2_cbc() ->
+    [{rc2_cbc,
+     <<146,210,160,124,215,227,153,239,227,17,222,140,3,93,27,191>>,
+      <<72,91,135,182,25,42,35,210>>,
+     <<36,245,206,158,168,230,58,69,148,137,32,192,250,41,237,181,181,251, 192,2,175,135,177,171,57,30,111,117,159,149,15,28,88,158,28,81,28,115, 85,219,241,82,117,222,91,85,73,117,164,25,182,52,191,64,123,57,26,19, 211,27,253,31,194,219,231,104,247,240,172,130,119,21,225,154,101,247, 32,216,42,216,133,169,78,22,97,27,227,26,196,224,172,168,17,9,148,55, 203,91,252,40,61,226,236,221,215,160,78,63,13,181,68,57,196,241,185, 207, 116,129,152,237,60,139,247,153,27,146,161,246,222,98,185,222,152, 187,135, 236,86,34,7,110,91,230,173,34,160,242,202,222,121,127,181,140, 101,203,195, 190,88,250,86,147,127,87,72,126,171,16,71,47,110,248,88, 14,29,143,161,152, 129,236,148,22,152,186,208,119,70,8,174,193,203,100, 193,203,200,117,102,242, 134,142,96,125,135,200,217,190,76,117,50,70, 209,186,101,241,200,91,40,193,54, 90,195,38,47,59,197,38,234,86,223,16, 51,253,204,129,20,171,66,21,241,26,135,216, 196,114,110,91,15,53,40, 164,201,136,113,95,247,51,181,208,241,68,168,98,151,36, 155,72,24,57, 42,191,14,125,204,10,167,214,233,138,115,125,234,121,134,227,26,247, 77,200,117,110,117,111,168,156,206,67,159,149,189,173,150,193,91,199, 216,153,22, 189,137,185,89,160,13,131,132,58,109,28,110,246,252,251,14, 232,91,38,52,29,101,188,69,123,50,0,130,178,93,73,239,118,7,77,35,59, 253,10,159,45,86,142,37,78,232,48>>
+     }].
+aes_cbc128() ->
+    [{aes_cbc128,
+      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+      hexstr2bin("000102030405060708090a0b0c0d0e0f"),
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+     {aes_cbc128,
+      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+      hexstr2bin("7649ABAC8119B246CEE98E9B12E9197D"),
+      hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+     {aes_cbc128,
+      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+      hexstr2bin("5086CB9B507219EE95DB113A917678B2"),
+      hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+     {aes_cbc128,
+      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+      hexstr2bin("73BED6B8E3C1743B7116E69E22229516"),
+      hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
+    ].
+
+aes_cbc256() -> 
+    [{aes_cbc256,
+      hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+      hexstr2bin("000102030405060708090A0B0C0D0E0F"),
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+      {aes_cbc256,
+       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+       hexstr2bin("F58C4C04D6E5F1BA779EABFB5F7BFBD6"),
+       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+      {aes_cbc256,
+       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+       hexstr2bin("9CFC4E967EDB808D679F777BC6702C7D"),
+       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+      {aes_cbc256,
+       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+       hexstr2bin("39F23369A9D9BACFA530E26304231461"),
+       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
+     ].
+
+aes_cfb128() -> 
+    [{aes_cfb128,
+      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+      hexstr2bin("000102030405060708090a0b0c0d0e0f"),
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+      {aes_cfb128,
+       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+       hexstr2bin("3B3FD92EB72DAD20333449F8E83CFB4A"),
+       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+      {aes_cfb128,
+       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+       hexstr2bin("C8A64537A0B3A93FCDE3CDAD9F1CE58B"),
+       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+      {aes_cfb128,
+       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+       hexstr2bin("26751F67A3CBB140B1808CF187A4F4DF"),
+       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
+     ].
+
+blowfish_cbc() ->
+    [{blowfish_cbc,
+      hexstr2bin("0123456789ABCDEFF0E1D2C3B4A59687"), 
+      hexstr2bin("FEDCBA9876543210"),
+      hexstr2bin("37363534333231204E6F77206973207468652074696D6520666F722000000000")
+     }].
+
+blowfish_ecb() ->
+    [
+     {blowfish_ecb,
+      hexstr2bin("0000000000000000"), 
+      hexstr2bin("0000000000000000")},
+     {blowfish_ecb,
+      hexstr2bin("FFFFFFFFFFFFFFFF"), 
+      hexstr2bin("FFFFFFFFFFFFFFFF")},
+     {blowfish_ecb,
+      hexstr2bin("3000000000000000"), 
+      hexstr2bin("1000000000000001")},
+     {blowfish_ecb,
+      hexstr2bin("1111111111111111"), 
+      hexstr2bin("1111111111111111")},
+     {blowfish_ecb,
+      hexstr2bin("0123456789ABCDEF"), 
+      hexstr2bin("1111111111111111")},
+     {blowfish_ecb,
+      hexstr2bin("0000000000000000"), 
+      hexstr2bin("0000000000000000")},
+     {blowfish_ecb,
+      hexstr2bin("FEDCBA9876543210"), 
+      hexstr2bin("0123456789ABCDEF")},
+     {blowfish_ecb,
+      hexstr2bin("7CA110454A1A6E57"), 
+      hexstr2bin("01A1D6D039776742")},
+     {blowfish_ecb,
+      hexstr2bin("0131D9619DC1376E"), 
+      hexstr2bin("5CD54CA83DEF57DA")},
+     {blowfish_ecb,
+      hexstr2bin("07A1133E4A0B2686"), 
+      hexstr2bin("0248D43806F67172")},
+     {blowfish_ecb,
+      hexstr2bin("3849674C2602319E"), 
+      hexstr2bin("51454B582DDF440A")},
+     {blowfish_ecb,
+      hexstr2bin("04B915BA43FEB5B6"), 
+      hexstr2bin("42FD443059577FA2")},
+     {blowfish_ecb,
+      hexstr2bin("0113B970FD34F2CE"), 
+      hexstr2bin("059B5E0851CF143A")},
+     {blowfish_ecb,
+      hexstr2bin("0170F175468FB5E6"), 
+      hexstr2bin("0756D8E0774761D2")},
+     {blowfish_ecb,
+      hexstr2bin("43297FAD38E373FE"), 
+      hexstr2bin("762514B829BF486A")},
+     {blowfish_ecb,
+      hexstr2bin("07A7137045DA2A16"), 
+      hexstr2bin("3BDD119049372802")},
+     {blowfish_ecb,
+      hexstr2bin("04689104C2FD3B2F"), 
+      hexstr2bin("26955F6835AF609A")},
+     {blowfish_ecb,
+      hexstr2bin("37D06BB516CB7546"), 
+      hexstr2bin("164D5E404F275232")},
+     {blowfish_ecb,
+      hexstr2bin("1F08260D1AC2465E"), 
+      hexstr2bin("6B056E18759F5CCA")},
+     {blowfish_ecb,
+      hexstr2bin("584023641ABA6176"), 
+      hexstr2bin("004BD6EF09176062")},
+     {blowfish_ecb,
+      hexstr2bin("025816164629B007"), 
+      hexstr2bin("480D39006EE762F2")},
+     {blowfish_ecb,
+      hexstr2bin("49793EBC79B3258F"), 
+      hexstr2bin("437540C8698F3CFA")},
+     {blowfish_ecb,
+      hexstr2bin("018310DC409B26D6"), 
+      hexstr2bin("1D9D5C5018F728C2")},
+     {blowfish_ecb,
+      hexstr2bin("1C587F1C13924FEF"), 
+      hexstr2bin("305532286D6F295A")},
+     {blowfish_ecb,
+      hexstr2bin("0101010101010101"), 
+      hexstr2bin("0123456789ABCDEF")},
+     {blowfish_ecb,
+      hexstr2bin("1F1F1F1F0E0E0E0E"), 
+      hexstr2bin("0123456789ABCDEF")},
+     {blowfish_ecb,
+      hexstr2bin("E0FEE0FEF1FEF1FE"), 
+      hexstr2bin("0123456789ABCDEF")},
+     {blowfish_ecb,
+      hexstr2bin("0000000000000000"), 
+      hexstr2bin("FFFFFFFFFFFFFFFF")},
+     {blowfish_ecb,
+      hexstr2bin("FFFFFFFFFFFFFFFF"), 
+      hexstr2bin("0000000000000000")},
+     {blowfish_ecb,
+      hexstr2bin("0123456789ABCDEF"), 
+      hexstr2bin("0000000000000000")},
+     {blowfish_ecb,
+      hexstr2bin("FEDCBA9876543210"), 
+      hexstr2bin("FFFFFFFFFFFFFFFF")}
+    ].
+
+blowfish_cfb64() ->
+    [{blowfish_cfb64,
+      hexstr2bin("0123456789ABCDEFF0E1D2C3B4A59687"), 
+      hexstr2bin("FEDCBA9876543210"),
+      hexstr2bin("37363534333231204E6F77206973207468652074696D6520666F722000")
+     }].
+blowfish_ofb64() ->
+    [{blowfish_ofb64,
+      hexstr2bin("0123456789ABCDEFF0E1D2C3B4A59687"), 
+      hexstr2bin("FEDCBA9876543210"),
+      hexstr2bin("37363534333231204E6F77206973207468652074696D6520666F722000")
+     }].
+
+rc4() ->
+    [{rc4, <<"apaapa">>, <<"Yo baby yo">>},
+     {rc4, <<"apaapa">>, list_to_binary(lists:seq(0, 255))}
+    ].
+
+aes_ctr() ->
+    [  %% F.5.3  CTR-AES192.Encrypt
+       {aes_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"), 
+	hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+       {aes_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff00"), 
+	hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+       {aes_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff01"), 
+	hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef") },
+       {aes_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff02"), 
+	hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")},
+       
+       %% F.5.3  CTR-AES192.Encrypt
+       {aes_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"), 
+	hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+       {aes_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff00"), 
+	hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+       {aes_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff01"), 
+	hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+       {aes_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff02"), 
+	hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")},
+       
+       %% F.5.5  CTR-AES256.Encrypt
+       {aes_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"), 
+	hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+       {aes_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff00"), 
+	hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+       {aes_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff01"), 
+	hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+       {aes_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff02"), 
+	hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
+    ].
+
+rsa_plain() ->
+    <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
+      "09812312908312378623487263487623412039812 huagasd">>.
+rsa_public() ->
+    [65537, 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123].
+rsa_private() ->
+    rsa_public() ++ [7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945].
+
+dss_plain() ->
+    rsa_plain().
+dss_public() ->
+    25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978.
+dss_private() ->
+    441502407453038284293378221372000880210588566361.  
+dss_params() ->
+    [109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797,
+     1349199015905534965792122312016505075413456283393,
+     18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669].
+
+ec_key_named() ->
+    {D2_pub, D2_priv} = crypto:generate_key(ecdh, sect113r2),
+    {[D2_priv, sect113r2], [D2_pub, sect113r2]}.  
+
+ec_msg() ->
+    <<99,234,6,64,190,237,201,99,80,248,58,40,70,45,149,218,5,246,242,63>>.
+
+srp3() ->
     Username = <<"alice">>,
     Password = <<"password123">>,
     Salt = hexstr2bin("2857827A19266A1F2BC6"),
@@ -1978,21 +1253,12 @@ srp3(Config) when is_list(Config) ->
 			    "46ABF4FF39498DAFDD2C82924F7D7BD76CDFCE688C77D93F18A65409"
 			    "9176A9192615DC0277AE7C12F1F6A7F6563FCA11675D809AF578BDE5"
 			    "2B51E05D440B63099A017A0B45044801"),
-    UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
+    UserPassHash = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
     Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
-    ClientPublic = crypto:mod_pow(Generator, ClientPrivate, Prime),
+    ClientPublic = crypto:mod_pow(Generator, ClientPrivate, Prime), 
+    srp(ClientPrivate, Generator, Prime, Version, Verifier, ServerPublic, ServerPrivate, UserPassHash, Scrambler, SessionKey).
 
-    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
-    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
-    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
-				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
-    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
-				    {host, [Verifier, Prime, Version, Scrambler]}).
-
-srp6(doc) ->
-    ["SRP-6 test vectors generated by http://srp.stanford.edu/demo/demo.html"];
-srp6(suite) -> [];
-srp6(Config) when is_list(Config) ->
+srp6() ->
     Username = <<"alice">>,
     Password = <<"password123">>,
     Salt = hexstr2bin("2857827A19266A1F2BC6"),
@@ -2029,21 +1295,12 @@ srp6(Config) when is_list(Config) ->
 				 "7216F9CD8A4AC39F0429857D8D1023066614BDFCBCB89F59A0FEB81C"
 				 "72E992AAD89095A84B6A5FADA152369AB1E350A03693BEF044DF3EDF"
 				 "0C34741F4696C30E9F675D09F58ACBEB"),
-    UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
+    UserPassHash = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
     Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
     ClientPublic = crypto:mod_pow(Generator, ClientPrivate, Prime),
+    srp(ClientPrivate, Generator, Prime, Version, Verifier, ServerPublic, ServerPrivate, UserPassHash, Scrambler, SessionKey).
 
-    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
-    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
-    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
-				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
-    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
-				    {host, [Verifier, Prime, Version, Scrambler]}).
-
-srp6a(doc) ->
-    ["SRP-6a test vectors from RFC5054."];
-srp6a(suite) -> [];
-srp6a(Config) when is_list(Config) ->
+srp6a() ->
     Username = <<"alice">>,
     Password = <<"password123">>,
     Salt = hexstr2bin("BEB25379D1A8581EB5A727673A2441EE"),
@@ -2065,278 +1322,36 @@ srp6a(Config) when is_list(Config) ->
     ServerPrivate = hexstr2bin("E487CB59D31AC550471E81F00F6928E01DDA08E974A004F49E61F5D1"
 			  "05284D20"),
     ClientPublic = hexstr2bin("61D5E490F6F1B79547B0704C436F523DD0E560F0C64115BB72557EC4"
-			 "4352E8903211C04692272D8B2D1A5358A2CF1B6E0BFCF99F921530EC"
-			 "8E39356179EAE45E42BA92AEACED825171E1E8B9AF6D9C03E1327F44"
-			 "BE087EF06530E69F66615261EEF54073CA11CF5858F0EDFDFE15EFEA"
-			 "B349EF5D76988A3672FAC47B0769447B"),
+			      "4352E8903211C04692272D8B2D1A5358A2CF1B6E0BFCF99F921530EC"
+			      "8E39356179EAE45E42BA92AEACED825171E1E8B9AF6D9C03E1327F44"
+			      "BE087EF06530E69F66615261EEF54073CA11CF5858F0EDFDFE15EFEA"
+			      "B349EF5D76988A3672FAC47B0769447B"),
     ServerPublic = hexstr2bin("BD0C61512C692C0CB6D041FA01BB152D4916A1E77AF46AE105393011"
-			 "BAF38964DC46A0670DD125B95A981652236F99D9B681CBF87837EC99"
-			 "6C6DA04453728610D0C6DDB58B318885D7D82C7F8DEB75CE7BD4FBAA"
-			 "37089E6F9C6059F388838E7A00030B331EB76840910440B1B27AAEAE"
-			 "EB4012B7D7665238A8E3FB004B117B58"),
- 
+			      "BAF38964DC46A0670DD125B95A981652236F99D9B681CBF87837EC99"
+			      "6C6DA04453728610D0C6DDB58B318885D7D82C7F8DEB75CE7BD4FBAA"
+			      "37089E6F9C6059F388838E7A00030B331EB76840910440B1B27AAEAE"
+			      "EB4012B7D7665238A8E3FB004B117B58"),
+    
     SessionKey = hexstr2bin("B0DC82BABCF30674AE450C0287745E7990A3381F63B387AAF271A10D"
 			    "233861E359B48220F7C4693C9AE12B0A6F67809F0876E2D013800D6C"
 			    "41BB59B6D5979B5C00A172B4A2A5903A0BDCAF8A709585EB2AFAFA8F"
 			    "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
 			    "C346D7E474B29EDE8A469FFECA686E5A"),
-    UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
+    UserPassHash = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
     Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
-
-    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
-    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
-
-    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
-				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
-    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
-				    {host, [Verifier, Prime, Version, Scrambler]}).
-    
-%%
-%%
-exor_test(doc) ->
-    ["Test the exor function."];
-exor_test(suite) ->
-    [];
-exor_test(Config) when is_list(Config) ->
-    B = <<1, 2, 3, 4, 5, 6, 7, 8, 9, 10>>,
-    Z1 = zero_bin(B),
-    Z1 = crypto:exor(B, B),
-    B1 = crypto:rand_bytes(100),
-    B2 = crypto:rand_bytes(100),
-    Z2 = zero_bin(B1),
-    Z2 = crypto:exor(B1, B1),
-    Z2 = crypto:exor(B2, B2),
-    R = xor_bytes(B1, B2),
-    R = crypto:exor(B1, B2),
-    ok.
-
-%%
-%%
-rc4_test(doc) ->
-    ["Test rc4 encryption ."];
-rc4_test(suite) ->
-    [];
-rc4_test(Config) when is_list(Config) ->
-    CT1 = <<"Yo baby yo">>,
-    R1 = <<118,122,68,110,157,166,141,212,139,39>>,
-    K = "apaapa",
-    R1 = crypto:rc4_encrypt(K, CT1),
-    CT1 = crypto:rc4_encrypt(K, R1),
-    CT2 = lists:seq(0, 255),
-    R2 = crypto:rc4_encrypt(K, CT2),
-    CT2 = binary_to_list(crypto:rc4_encrypt(K, R2)),
-    ok.
-
-rc4_stream_test(doc) ->
-    ["Test rc4 stream encryption ."];
-rc4_stream_test(suite) ->
-    [];
-rc4_stream_test(Config) when is_list(Config) ->
-    CT1 = <<"Yo ">>,
-    CT2 = <<"baby yo">>,
-    K = "apaapa",
-    State0 = crypto:rc4_set_key(K),
-    {State1, R1} = crypto:rc4_encrypt_with_state(State0, CT1),
-    {_State2, R2} = crypto:rc4_encrypt_with_state(State1, CT2),
-    R = list_to_binary([R1, R2]),
-    <<118,122,68,110,157,166,141,212,139,39>> = R,
-    ok.
-
-blowfish_cfb64(doc) -> ["Test Blowfish encrypt/decrypt."];
-blowfish_cfb64(suite) -> [];
-blowfish_cfb64(Config) when is_list(Config) ->   			
-    Key = <<1,35,69,103,137,171,205,239,240,225,210,195,180,165,150,135>>,
-
-    IVec = <<254,220,186,152,118,84,50,16>>,
-    Plain = <<"7654321 Now is the time for ">>,
-    Enc = <<231,50,20,162,130,33,57,202,242,110,207,109,46,185,231,110,61,163,222,4,209,81,114,0,81,157,87,166>>,
-
-    Enc = crypto:blowfish_cfb64_encrypt(Key, IVec, Plain),
-    Plain = crypto:blowfish_cfb64_decrypt(Key, IVec, Enc),
-
-    Key2 = <<"A2B4C">>,
-    IVec2 = <<"12345678">>,
-    Plain2 = <<"badger at my table....!">>,
-    Enc2 = <<173,76,128,155,70,81,79,228,4,162,188,92,119,53,144,89,93,236,28,164,176,16,138>>,
-
-    Enc2 = crypto:blowfish_cfb64_encrypt(Key2, IVec2, Plain2),
-    Plain2 = crypto:blowfish_cfb64_decrypt(Key2, IVec2, Enc2).
-
-
-smp(doc) -> "Check concurrent access to crypto driver";
-smp(suite) -> [];
-smp(Config) ->
-    case erlang:system_info(smp_support) of
-	true ->
-	    NumOfProcs = erlang:system_info(schedulers),
-	    io:format("smp starting ~p workers\n",[NumOfProcs]),
-	    Seeds = [random:uniform(9999) || _ <- lists:seq(1,NumOfProcs)],
-	    Parent = self(),
-	    Pids = [spawn_link(fun()-> worker(Seed,Config,Parent) end)
-		    || Seed <- Seeds],
-	    wait_pids(Pids);
-
-	false ->
-	    {skipped,"No smp support"}
-    end.
-	    
-worker(Seed, Config, Parent) ->
-    io:format("smp worker ~p, seed=~p~n",[self(),Seed]),
-    random:seed(Seed,Seed,Seed),
-    worker_loop(100, Config),
-    %%io:format("worker ~p done\n",[self()]),
-    Parent ! self().
-
-worker_loop(0, _) ->
-    ok;
-worker_loop(N, Config) ->
-    Funcs = { md5, md5_update, md5_mac, md5_mac_io, sha, sha_update, des_cbc,
-	      aes_cfb, aes_cbc, des_cbc_iter, rand_uniform_test, strong_rand_test,
-	      rsa_verify_test, exor_test, rc4_test, rc4_stream_test, mod_exp_test,
-              hmac_update_md5, hmac_update_sha, hmac_update_sha256, hmac_update_sha512,
-	      hmac_rfc2202, hmac_rfc4231_sha224, hmac_rfc4231_sha256, hmac_rfc4231_sha384,
-	      hmac_rfc4231_sha512, aes_ctr_stream },
-
-    F = element(random:uniform(size(Funcs)),Funcs),
-    %%io:format("worker ~p calling ~p\n",[self(),F]),
-    ?MODULE:F(Config),
-    worker_loop(N-1,Config).
-    
-wait_pids([]) -> 
-    ok;
-wait_pids(Pids) ->
-    receive
-	Pid ->
-	    ?line true = lists:member(Pid,Pids),
-	    Others = lists:delete(Pid,Pids),
-	    io:format("wait_pid got ~p, still waiting for ~p\n",[Pid,Others]),
-	    wait_pids(Others)
-    end.
-
-%%
-%% Help functions
-%%
-
-% match
-m(X, X) ->
-    ?line true.
-t(true) ->
-    true.
-
-% hexstr2bin
-hexstr2bin(S) ->
-    list_to_binary(hexstr2list(S)).
-
-hexstr2list([X,Y|T]) ->
-    [mkint(X)*16 + mkint(Y) | hexstr2list(T)];
-hexstr2list([]) ->
-    [].
-
-mkint(C) when $0 =< C, C =< $9 ->
-    C - $0;
-mkint(C) when $A =< C, C =< $F ->
-    C - $A + 10;
-mkint(C) when $a =< C, C =< $f ->
-    C - $a + 10.
-
-%% mod_exp in erlang (copied from jungerl's ssh_math.erl)
-ipow(A, B, M) when M > 0, B >= 0 ->
-    if A == 1 -> 
- 	    1;
-       true -> 
- 	    ipow(A, B, M, 1)
-    end.
-
-ipow(A, 1, M, Prod) ->
-    (A*Prod) rem M;
-ipow(_A, 0, _M, Prod) ->
-    Prod;
-ipow(A, B, M, Prod)  ->
-    B1 = B bsr 1,
-    A1 = (A*A) rem M,
-    if B - B1 == B1 ->
-	    ipow(A1, B1, M, Prod);
-       true ->
-	    ipow(A1, B1, M, (A*Prod) rem M)
-    end.
-
-%%
-%% Invert an element X mod P
-%% Calculated as {1, {A,B}} = egcd(X,P),
-%%   1 == P*A + X*B == X*B (mod P) i.e B is the inverse element
-%%
-%% X > 0, P > 0, X < P   (P should be prime)
-%%
-%% invert(X,P) when X > 0, P > 0, X < P ->
-%%     I = inv(X,P,1,0),
-%%     if 
-%%         I < 0 -> P + I;
-%%         true -> I
-%%     end.
-
-%% inv(0,_,_,Q) -> Q;
-%% inv(X,P,R1,Q1) ->
-%%     D = P div X,
-%%     inv(P rem X, X, Q1 - D*R1, R1).    
-
-sized_binary(Binary) when is_binary(Binary) ->
-    <<(size(Binary)):32/integer, Binary/binary>>;
-sized_binary(List) ->
-    sized_binary(list_to_binary(List)).
-
-unsized_binary(<<Sz:32/integer, Binary:Sz/binary>>) ->
-    Binary.
-
-xor_bytes(Bin1, Bin2) when is_binary(Bin1), is_binary(Bin2) ->
-    L1 = binary_to_list(Bin1),
-    L2 = binary_to_list(Bin2),
-    list_to_binary(xor_bytes(L1, L2));
-xor_bytes(L1, L2) ->
-    xor_bytes(L1, L2, []).
-
-xor_bytes([], [], Acc) ->
-    lists:reverse(Acc);
-xor_bytes([N1 | Tl1], [N2 | Tl2], Acc) ->
-    xor_bytes(Tl1, Tl2, [N1 bxor N2 | Acc]).
-
-zero_bin(N) when is_integer(N) ->
-    N8 = N * 8,
-    <<0:N8/integer>>;
-zero_bin(B) when is_binary(B) ->
-    zero_bin(size(B)).
-
-my_dss_verify(Data,[Sign|Tail],Key) ->
-    Res = my_dss_verify(Data,sized_binary(Sign),Key),
-    case Tail of
-        [] ->  Res;
-        _ -> ?line Res = my_dss_verify(Data,Tail,Key)
-    end;       
-my_dss_verify(Data,Sign,Key) ->
-    ?line Res = crypto:dss_verify(Data, Sign, Key),
-    ?line Res = crypto:dss_verify(sha, Data, Sign, Key),
-    ?line <<_:32,Raw/binary>> = Data,
-    ?line Res = crypto:dss_verify(none, crypto:sha(Raw), Sign, Key),
-    Res.
-
-my_dss_sign(Data,Key) ->
-    ?line S1 = crypto:dss_sign(Data, Key),
-    ?line S2 = crypto:dss_sign(sha, Data, Key),
-    ?line <<_:32,Raw/binary>> = Data,
-    ?line S3 = crypto:dss_sign(none, crypto:sha(Raw), Key),
-    [S1,S2,S3].
-
-openssl_version() ->
-    case crypto:info_lib() of
-	[{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer) ->
-	    LibVer;
-	_ ->
-	    undefined
-    end.
-
-if_supported(Algorithm, Fun) ->
-    case proplists:get_bool(Algorithm, crypto:algorithms()) of
-	true ->
-	    Fun();
-	_ ->
-	    {skipped, io:format("~s not spupported", [Algorithm])}
-    end.
+    ClientPublic = crypto:mod_pow(Generator, ClientPrivate, Prime), 
+    srp(ClientPrivate, Generator, Prime, Version, Verifier, ServerPublic, ServerPrivate, UserPassHash, Scrambler, SessionKey).
+
+srp(ClientPrivate, Generator, Prime, Version, Verifier, ServerPublic, ServerPrivate, UserPassHash, Scrambler, SessionKey)->
+    {srp, ClientPrivate, 
+     {user, [Generator, Prime, Version]}, {user, [UserPassHash, Prime, Generator, Version, Scrambler]}, 
+     ServerPublic, ServerPrivate, {host, [Verifier, Generator, Prime, Version]},
+     {host, [Verifier, Prime, Version, Scrambler]},
+     SessionKey}.
+ecdh() ->
+    {ecdh, 10053111454769593468622878414300213417816614162107065345116848162553478019161427871683337786549966,
+     1373339791687564785573162818422814591820885704654,
+     secp160r1, 990333295438215762119481641129490894973766052278}.
+
+dh() ->
+    {dh, 0087761979513264537414556992123116644042638206717762626089877284926656954974893442000747478454809111207351620687968672207938731607963470779396984752680274820156266685080223616226905101126463253150237669547023934604953898814222890239130021414026118792251620881355456432549881723310342870016961804255746630219, 2}.
diff --git a/lib/crypto/test/old_crypto_SUITE.erl b/lib/crypto/test/old_crypto_SUITE.erl
new file mode 100644
index 0000000000..040edbf092
--- /dev/null
+++ b/lib/crypto/test/old_crypto_SUITE.erl
@@ -0,0 +1,2342 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(old_crypto_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2,
+	 end_per_testcase/2,
+	 info/1,
+	 link_test/1,
+	 md5/1,
+	 md5_update/1,
+	 md4/1,
+	 md4_update/1,
+	 sha/1,
+	 sha_update/1,
+         hmac_update_sha/1,
+         hmac_update_sha_n/1,
+         hmac_update_sha256/1,
+         hmac_update_sha512/1,
+         hmac_update_md5/1,
+         hmac_update_md5_io/1,
+         hmac_update_md5_n/1,
+         hmac_rfc2202/1,
+	 hmac_rfc4231_sha224/1,
+	 hmac_rfc4231_sha256/1,
+	 hmac_rfc4231_sha384/1,
+	 hmac_rfc4231_sha512/1,
+   ripemd160/1,
+   ripemd160_update/1,
+	 sha256/1,
+	 sha256_update/1,
+	 sha512/1,
+	 sha512_update/1,
+	 md5_mac/1,
+	 md5_mac_io/1,
+	 des_cbc/1,
+	 des_cbc_iter/1,
+	 des_cfb/1,
+	 des_cfb_iter/1,
+	 des_ecb/1,
+	 des3_cbc/1,
+	 des3_cfb/1,
+	 rc2_cbc/1,
+	 aes_cfb/1,
+	 aes_cbc/1,
+	 aes_cbc_iter/1,
+	 aes_ctr/1,
+	 aes_ctr_stream/1,
+	 mod_exp_test/1,
+	 rand_uniform_test/1,
+	 strong_rand_test/1,
+	 rsa_verify_test/1,
+	 dsa_verify_test/1,
+	 rsa_sign_test/1,
+	 rsa_sign_hash_test/1,
+	 dsa_sign_test/1,	 
+	 dsa_sign_hash_test/1,
+	 rsa_encrypt_decrypt/1,
+	 dh/1,
+	 srp3/1, srp6/1, srp6a/1,
+	 ec/1,
+	 exor_test/1,
+	 rc4_test/1,
+	 rc4_stream_test/1,
+	 blowfish_cfb64/1,
+	 smp/1]).
+
+-export([hexstr2bin/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [link_test, {group, info}].
+
+groups() ->
+    [{info, [sequence],[info, {group, rest}]},
+     {rest, [],
+      [md5, md5_update, md4, md4_update, md5_mac,
+       md5_mac_io, ripemd160, ripemd160_update, sha, sha_update,
+       sha256, sha256_update, sha512, sha512_update,
+       hmac_update_sha, hmac_update_sha_n, hmac_update_sha256, hmac_update_sha512,
+       hmac_update_md5_n, hmac_update_md5_io, hmac_update_md5,
+       hmac_rfc2202, hmac_rfc4231_sha224, hmac_rfc4231_sha256,
+       hmac_rfc4231_sha384, hmac_rfc4231_sha512,
+       des_cbc, aes_cfb, aes_cbc,
+       des_cfb, des_cfb_iter, des3_cbc, des3_cfb, rc2_cbc,
+       aes_cbc_iter, aes_ctr, aes_ctr_stream, des_cbc_iter, des_ecb,
+       rand_uniform_test, strong_rand_test,
+       rsa_verify_test, dsa_verify_test, rsa_sign_test,
+       rsa_sign_hash_test, dsa_sign_test, dsa_sign_hash_test,
+       rsa_encrypt_decrypt, dh, srp3, srp6, srp6a, ec, exor_test,
+       rc4_test, rc4_stream_test, mod_exp_test, blowfish_cfb64,
+       smp]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_testcase(info, Config) ->
+    Config;
+init_per_testcase(_Name,Config) ->
+    io:format("init_per_testcase\n"),
+    ?line crypto:start(),
+    Config.
+
+end_per_testcase(info, Config) ->
+    Config;
+end_per_testcase(_Name,Config) ->
+    io:format("end_per_testcase\n"),
+    ?line crypto:stop(),
+    Config.
+
+%%
+%%
+link_test(doc) ->
+    ["Test that the library is statically linked to libcrypto.a."];
+link_test(suite) ->
+    [];
+link_test(Config) when is_list(Config) ->
+    ?line case os:type() of
+	      {unix,darwin} -> {skipped,"Darwin cannot link statically"};
+	      {unix,_} -> link_test_1();
+	      _ -> {skip,"Only runs on Unix"}
+	  end.
+
+link_test_1() ->    
+    ?line CryptoPriv = code:priv_dir(crypto),
+    ?line Wc = filename:join([CryptoPriv,"lib","crypto.*"]),
+    ?line case filelib:wildcard(Wc) of
+	      [] -> {skip,"Didn't find the crypto driver"};
+	      [Drv] -> link_test_2(Drv)
+	  end.
+
+link_test_2(Drv) ->
+    case ldd_program() of
+	none ->
+	    {skip,"No ldd-like program found"};
+	Ldd ->
+	    Cmd = Ldd ++ " " ++ Drv,
+	    Libs = os:cmd(Cmd),
+	    io:format("~p\n", [Libs]),
+	    case string:str(Libs, "libcrypto") of
+		0 -> 
+		    case ?t:is_commercial() of
+			true ->
+			    ?t:fail({libcrypto,statically_linked});
+			false ->
+			    {comment,"Statically linked (OK for open-source platform)"}
+		    end;
+		_ ->
+		    ok
+	    end
+    end.
+
+ldd_program() ->
+    case os:find_executable("ldd") of
+	false ->
+	    case os:type() of
+		{unix,darwin} ->
+		    case os:find_executable("otool") of
+			false -> none;
+			Otool -> Otool ++ " -L"
+		    end
+	    end;
+ 	Ldd when is_list(Ldd) -> Ldd
+    end.
+
+
+
+info(doc) ->
+    ["Call the info function."];
+info(suite) ->
+    [];
+info(Config) when is_list(Config) ->
+    case {code:lib_dir(crypto),?t:is_commercial()} of
+	{{error,bad_name},false} ->
+	    {skip,"Missing crypto application"};
+	{_,_} ->
+	    ?line crypto:start(),
+	    ?line Info = crypto:info(),
+	    ?line Exports = lists:usort([F || {F,_} <- crypto:module_info(exports)]),
+	    ?line [] = Info -- Exports,
+	    ?line NotInInfo = Exports -- Info,
+	    io:format("NotInInfo = ~p\n", [NotInInfo]),
+	    %% BlackList = lists:sort([des_ede3_cbc_decrypt, des_ede3_cbc_encrypt,
+	    %% 			    dh_check, dh_generate_parameters,
+	    %% 			    module_info, start, stop, version]),
+	    %% ?line BlackList = NotInInfo,
+
+	    ?line InfoLib = crypto:info_lib(),
+	    ?line [_|_] = InfoLib,
+	    F = fun([{Name,VerN,VerS}|T],Me) ->
+			?line true = is_binary(Name),
+			?line true = is_integer(VerN),
+			?line true = is_binary(VerS),
+			Me(T,Me);
+		   ([],_) ->
+			ok
+		end,
+	    ?line F(InfoLib,F),
+	    ?line crypto:stop()
+     end.
+
+%%
+%%
+md5(doc) ->
+    ["Generate MD5 message digests and check the result. Examples are "
+     "from RFC-1321."];
+md5(suite) ->
+    [];
+md5(Config) when is_list(Config) ->
+    ?line m(crypto:md5(""), 
+		hexstr2bin("d41d8cd98f00b204e9800998ecf8427e")),
+    ?line m(crypto:md5("a"), 
+		hexstr2bin("0cc175b9c0f1b6a831c399e269772661")),
+    ?line m(crypto:md5("abc"), 
+		hexstr2bin("900150983cd24fb0d6963f7d28e17f72")),
+    ?line m(crypto:md5("message digest"),
+		hexstr2bin("f96b697d7cb7938d525a2f31aaf161d0")),
+    ?line m(crypto:md5("abcdefghijklmnopqrstuvwxyz"),
+	    hexstr2bin("c3fcd3d76192e4007dfb496cca67e13b")),
+    ?line m(crypto:md5("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+		     "0123456789"),  
+	    hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f")),
+    ?line m(crypto:md5("12345678901234567890123456789012345678901234567890"
+		     "123456789012345678901234567890"),
+	    hexstr2bin("57edf4a22be3c955ac49da2e2107b67a")).
+
+%%
+%%
+md5_update(doc) ->
+    ["Generate MD5 message using md5_init, md5_update, and md5_final, and"
+     "check the result. Examples are from RFC-1321."];
+md5_update(suite) ->
+    [];
+md5_update(Config) when is_list(Config) ->
+    ?line Ctx = crypto:md5_init(),
+    ?line Ctx1 = crypto:md5_update(Ctx, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+    ?line Ctx2 = crypto:md5_update(Ctx1, "abcdefghijklmnopqrstuvwxyz"
+				   "0123456789"),
+    ?line m(crypto:md5_final(Ctx2),  
+	    hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f")).
+
+%%
+%%
+md4(doc) ->
+    ["Generate MD4 message digests and check the result. Examples are "
+     "from RFC-1321."];
+md4(suite) ->
+    [];
+md4(Config) when is_list(Config) ->
+    ?line m(crypto:md4(""), 
+	    hexstr2bin("31d6cfe0d16ae931b73c59d7e0c089c0")),
+    ?line m(crypto:md4("a"), 
+	    hexstr2bin("bde52cb31de33e46245e05fbdbd6fb24")),
+    ?line m(crypto:md4("abc"), 
+	    hexstr2bin("a448017aaf21d8525fc10ae87aa6729d")),
+    ?line m(crypto:md4("message digest"),
+	    hexstr2bin("d9130a8164549fe818874806e1c7014b")),
+    ?line m(crypto:md4("abcdefghijklmnopqrstuvwxyz"),
+	    hexstr2bin("d79e1c308aa5bbcdeea8ed63df412da9")),
+    ?line m(crypto:md4("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+		       "0123456789"),  
+	    hexstr2bin("043f8582f241db351ce627e153e7f0e4")),
+    ?line m(crypto:md4("12345678901234567890123456789012345678901234567890"
+		       "123456789012345678901234567890"),
+	    hexstr2bin("e33b4ddc9c38f2199c3e7b164fcc0536")).
+
+%%
+%%
+md4_update(doc) ->
+    ["Generate MD5 message using md5_init, md5_update, and md5_final, and"
+     "check the result. Examples are from RFC-1321."];
+md4_update(suite) ->
+    [];
+md4_update(Config) when is_list(Config) ->
+    ?line Ctx = crypto:md4_init(),
+    ?line Ctx1 = crypto:md4_update(Ctx, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+    ?line Ctx2 = crypto:md4_update(Ctx1, "abcdefghijklmnopqrstuvwxyz"
+				   "0123456789"),
+    ?line m(crypto:md4_final(Ctx2),  
+	    hexstr2bin("043f8582f241db351ce627e153e7f0e4")).
+
+%%
+%%
+sha(doc) ->
+    ["Generate SHA message digests and check the result. Examples are "
+     "from FIPS-180-1."];
+sha(suite) ->
+    [];
+sha(Config) when is_list(Config) ->
+    ?line m(crypto:sha("abc"),
+	     hexstr2bin("A9993E364706816ABA3E25717850C26C9CD0D89D")),
+    ?line m(crypto:sha("abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
+		       "nlmnomnopnopq"), 
+		hexstr2bin("84983E441C3BD26EBAAE4AA1F95129E5E54670F1")).
+
+
+%%
+hmac_update_sha_n(doc) ->
+    ["Request a larger-than-allowed SHA1 HMAC using hmac_init, hmac_update, and hmac_final_n. "
+     "Expected values for examples are generated using crypto:sha_mac." ];
+hmac_update_sha_n(suite) ->
+    [];
+hmac_update_sha_n(Config) when is_list(Config) ->
+    ?line Key = hexstr2bin("00010203101112132021222330313233"
+                           "04050607141516172425262734353637"
+                           "08090a0b18191a1b28292a2b38393a3b"
+                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(sha, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final_n(Ctx3, 1024),
+    ?line Exp = crypto:sha_mac(Key, lists:flatten([Data, Data2])),
+    ?line m(Exp, Mac),
+    ?line m(size(Exp), size(Mac)).
+
+
+hmac_update_sha(doc) ->
+    ["Generate an SHA1 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:sha_mac." ];
+hmac_update_sha(suite) ->
+    [];
+hmac_update_sha(Config) when is_list(Config) ->
+    ?line Key = hexstr2bin("00010203101112132021222330313233"
+                           "04050607141516172425262734353637"
+                           "08090a0b18191a1b28292a2b38393a3b"
+                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(sha, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final(Ctx3),
+    ?line Exp = crypto:hmac(sha, Key, lists:flatten([Data, Data2])),
+    ?line m(Exp, Mac).
+
+hmac_update_sha256(doc) ->
+    ["Generate an SHA256 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:sha256_mac." ];
+hmac_update_sha256(suite) ->
+    [];
+hmac_update_sha256(Config) when is_list(Config) ->
+    if_supported(sha256, fun() -> hmac_update_sha256_do() end).
+
+hmac_update_sha256_do() ->
+    ?line Key = hexstr2bin("00010203101112132021222330313233"
+                           "04050607141516172425262734353637"
+                           "08090a0b18191a1b28292a2b38393a3b"
+                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(sha256, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final(Ctx3),
+    ?line Exp = crypto:hmac(sha256, Key, lists:flatten([Data, Data2])),
+    ?line m(Exp, Mac).
+
+hmac_update_sha512(doc) ->
+    ["Generate an SHA512 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:sha512_mac." ];
+hmac_update_sha512(suite) ->
+    [];
+hmac_update_sha512(Config) when is_list(Config) ->
+    if_supported(sha512, fun() -> hmac_update_sha512_do() end).
+
+hmac_update_sha512_do() ->
+    ?line Key = hexstr2bin("00010203101112132021222330313233"
+                           "04050607141516172425262734353637"
+                           "08090a0b18191a1b28292a2b38393a3b"
+                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(sha512, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final(Ctx3),
+    ?line Exp = crypto:hmac(sha512, Key, lists:flatten([Data, Data2])),
+    ?line m(Exp, Mac).
+    
+hmac_update_md5(doc) ->
+    ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:md5_mac." ];
+hmac_update_md5(suite) ->
+    [];
+hmac_update_md5(Config) when is_list(Config) ->
+    % ?line Key2 = ["A fine speach", "by a fine man!"],
+    Key2 = "A fine speach by a fine man!",
+    ?line Long1 = "Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in liberty, and dedicated to the proposition that all men are created equal.",
+    ?line Long2 = "Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.",
+    ?line Long3 = "But, in a larger sense, we can not dedicate, we can not consecrate, we can not hallow this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us-that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion that we here highly resolve that these dead shall not have died in vain-that this nation, under God, shall have a new birth of freedom-and that government of the people, by the people, for the people, shall not perish from the earth.",
+    ?line CtxA = crypto:hmac_init(md5, Key2),
+    ?line CtxB = crypto:hmac_update(CtxA, Long1),
+    ?line CtxC = crypto:hmac_update(CtxB, Long2),
+    ?line CtxD = crypto:hmac_update(CtxC, Long3),
+    ?line Mac2 = crypto:hmac_final(CtxD),
+    ?line Exp2 = crypto:md5_mac(Key2, lists:flatten([Long1, Long2, Long3])), 
+    ?line m(Exp2, Mac2).
+
+hmac_rfc2202(doc) ->
+    ["Generate an HMAC using hmac, md5_mac, and sha_mac."
+     "Test vectors are taken from RFC-2202."];
+hmac_rfc2202(suite) ->
+    [];
+hmac_rfc2202(Config) when is_list(Config) ->
+    hmac_rfc2202_md5(),
+    hmac_rfc2202_sha().
+
+hmac_rfc2202_md5() ->
+    %% Test case 1
+    Case1Key = binary:copy(<<16#0b>>, 16),
+    Case1Data = <<"Hi There">>,
+    Case1Exp = hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d"),
+
+    ?line Case1Mac_1 = crypto:md5_mac(Case1Key, Case1Data),
+    ?line Case1Mac_2 = crypto:hmac(md5, Case1Key, Case1Data),
+    ?line m(Case1Exp, Case1Mac_1),
+    ?line m(Case1Exp, Case1Mac_2),
+
+    %% Test case 2
+    Case2Key = <<"Jefe">>,
+    Case2Data = <<"what do ya want for nothing?">>,
+    Case2Exp = hexstr2bin("750c783e6ab0b503eaa86e310a5db738"),
+
+    ?line Case2Mac_1 = crypto:md5_mac(Case2Key, Case2Data),
+    ?line Case2Mac_2 = crypto:hmac(md5, Case2Key, Case2Data),
+    ?line m(Case2Exp, Case2Mac_1),
+    ?line m(Case2Exp, Case2Mac_2),
+
+    %% Test case 3
+    Case3Key = binary:copy(<<16#aa>>, 16),
+    Case3Data = binary:copy(<<16#dd>>, 50),
+    Case3Exp = hexstr2bin("56be34521d144c88dbb8c733f0e8b3f6"),
+
+    ?line Case3Mac_1 = crypto:md5_mac(Case3Key, Case3Data),
+    ?line Case3Mac_2 = crypto:hmac(md5, Case3Key, Case3Data),
+    ?line m(Case3Exp, Case3Mac_1),
+    ?line m(Case3Exp, Case3Mac_2),
+
+    %% Test case 4
+    Case4Key = list_to_binary(lists:seq(1, 16#19)),
+    Case4Data = binary:copy(<<16#cd>>, 50),
+    Case4Exp = hexstr2bin("697eaf0aca3a3aea3a75164746ffaa79"),
+
+    ?line Case4Mac_1 = crypto:md5_mac(Case4Key, Case4Data),
+    ?line Case4Mac_2 = crypto:hmac(md5, Case4Key, Case4Data),
+    ?line m(Case4Exp, Case4Mac_1),
+    ?line m(Case4Exp, Case4Mac_2),
+
+    %% Test case 5
+    Case5Key = binary:copy(<<16#0c>>, 16),
+    Case5Data = "Test With Truncation",
+    Case5Exp = hexstr2bin("56461ef2342edc00f9bab995690efd4c"),
+    Case5Exp96 = hexstr2bin("56461ef2342edc00f9bab995"),
+
+    ?line Case5Mac_1 = crypto:md5_mac(Case5Key, Case5Data),
+    ?line Case5Mac_2 = crypto:hmac(md5, Case5Key, Case5Data),
+    ?line Case5Mac96_1 = crypto:md5_mac_96(Case5Key, Case5Data),
+    ?line Case5Mac96_2 = crypto:hmac(md5, Case5Key, Case5Data, 12),
+    ?line m(Case5Exp, Case5Mac_1),
+    ?line m(Case5Exp, Case5Mac_2),
+    ?line m(Case5Exp96, Case5Mac96_1),
+    ?line m(Case5Exp96, Case5Mac96_2),
+
+    %% Test case 6
+    Case6Key = binary:copy(<<16#aa>>, 80),
+    Case6Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+    Case6Exp = hexstr2bin("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd"),
+
+    ?line Case6Mac_1 = crypto:md5_mac(Case6Key, Case6Data),
+    ?line Case6Mac_2 = crypto:hmac(md5, Case6Key, Case6Data),
+    ?line m(Case6Exp, Case6Mac_1),
+    ?line m(Case6Exp, Case6Mac_2),
+
+    %% Test case 7
+    Case7Key = binary:copy(<<16#aa>>, 80),
+    Case7Data = <<"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data">>,
+    Case7Exp = hexstr2bin("6f630fad67cda0ee1fb1f562db3aa53e"),
+
+    ?line Case7Mac_1 = crypto:md5_mac(Case7Key, Case7Data),
+    ?line Case7Mac_2 = crypto:hmac(md5, Case7Key, Case7Data),
+    ?line m(Case7Exp, Case7Mac_1),
+    ?line m(Case7Exp, Case7Mac_2).
+
+hmac_rfc2202_sha() ->
+    %% Test case 1
+    Case1Key = binary:copy(<<16#0b>>, 20),
+    Case1Data = <<"Hi There">>,
+    Case1Exp = hexstr2bin("b617318655057264e28bc0b6fb378c8ef146be00"),
+
+    ?line Case1Mac_1 = crypto:sha_mac(Case1Key, Case1Data),
+    ?line Case1Mac_2 = crypto:hmac(sha, Case1Key, Case1Data),
+    ?line m(Case1Exp, Case1Mac_1),
+    ?line m(Case1Exp, Case1Mac_2),
+
+    %% Test case 2
+    Case2Key = <<"Jefe">>,
+    Case2Data = <<"what do ya want for nothing?">>,
+    Case2Exp = hexstr2bin("effcdf6ae5eb2fa2d27416d5f184df9c259a7c79"),
+
+    ?line Case2Mac_1 = crypto:sha_mac(Case2Key, Case2Data),
+    ?line Case2Mac_2 = crypto:hmac(sha, Case2Key, Case2Data),
+    ?line m(Case2Exp, Case2Mac_1),
+    ?line m(Case2Exp, Case2Mac_2),
+
+    %% Test case 3
+    Case3Key = binary:copy(<<16#aa>>, 20),
+    Case3Data = binary:copy(<<16#dd>>, 50),
+    Case3Exp = hexstr2bin("125d7342b9ac11cd91a39af48aa17b4f63f175d3"),
+
+    ?line Case3Mac_1 = crypto:sha_mac(Case3Key, Case3Data),
+    ?line Case3Mac_2 = crypto:hmac(sha, Case3Key, Case3Data),
+    ?line m(Case3Exp, Case3Mac_1),
+    ?line m(Case3Exp, Case3Mac_2),
+
+    %% Test case 4
+    Case4Key = list_to_binary(lists:seq(1, 16#19)),
+    Case4Data = binary:copy(<<16#cd>>, 50),
+    Case4Exp = hexstr2bin("4c9007f4026250c6bc8414f9bf50c86c2d7235da"),
+
+    ?line Case4Mac_1 = crypto:sha_mac(Case4Key, Case4Data),
+    ?line Case4Mac_2 = crypto:hmac(sha, Case4Key, Case4Data),
+    ?line m(Case4Exp, Case4Mac_1),
+    ?line m(Case4Exp, Case4Mac_2),
+
+    %% Test case 5
+    Case5Key = binary:copy(<<16#0c>>, 20),
+    Case5Data = "Test With Truncation",
+    Case5Exp = hexstr2bin("4c1a03424b55e07fe7f27be1d58bb9324a9a5a04"),
+    Case5Exp96 = hexstr2bin("4c1a03424b55e07fe7f27be1"),
+
+    ?line Case5Mac_1 = crypto:sha_mac(Case5Key, Case5Data),
+    ?line Case5Mac_2 = crypto:hmac(sha, Case5Key, Case5Data),
+    ?line Case5Mac96_1 = crypto:sha_mac_96(Case5Key, Case5Data),
+    ?line Case5Mac96_2 = crypto:hmac(sha, Case5Key, Case5Data, 12),
+    ?line m(Case5Exp, Case5Mac_1),
+    ?line m(Case5Exp, Case5Mac_2),
+    ?line m(Case5Exp96, Case5Mac96_1),
+    ?line m(Case5Exp96, Case5Mac96_2),
+
+    %% Test case 6
+    Case6Key = binary:copy(<<16#aa>>, 80),
+    Case6Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+    Case6Exp = hexstr2bin("aa4ae5e15272d00e95705637ce8a3b55ed402112"),
+
+    ?line Case6Mac_1 = crypto:sha_mac(Case6Key, Case6Data),
+    ?line Case6Mac_2 = crypto:hmac(sha, Case6Key, Case6Data),
+    ?line m(Case6Exp, Case6Mac_1),
+    ?line m(Case6Exp, Case6Mac_2),
+
+    %% Test case 7
+    Case7Key = binary:copy(<<16#aa>>, 80),
+    Case7Data = <<"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data">>,
+    Case7Exp = hexstr2bin("e8e99d0f45237d786d6bbaa7965c7808bbff1a91"),
+
+    ?line Case7Mac_1 = crypto:sha_mac(Case7Key, Case7Data),
+    ?line Case7Mac_2 = crypto:hmac(sha, Case7Key, Case7Data),
+    ?line m(Case7Exp, Case7Mac_1),
+    ?line m(Case7Exp, Case7Mac_2).
+
+hmac_rfc4231_sha224(doc) ->
+    ["Generate an HMAC using crypto:sha224_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
+     "Testvectors are take from RFC4231." ];
+hmac_rfc4231_sha224(suite) ->
+    [];
+hmac_rfc4231_sha224(Config) when is_list(Config) ->
+    if_supported(sha224, fun() -> hmac_rfc4231_sha224_do() end).
+
+hmac_rfc4231_sha256(doc) ->
+    ["Generate an HMAC using crypto:sha256_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
+     "Testvectors are take from RFC4231." ];
+hmac_rfc4231_sha256(suite) ->
+    [];
+hmac_rfc4231_sha256(Config) when is_list(Config) ->
+    if_supported(sha256, fun() -> hmac_rfc4231_sha256_do() end).
+
+hmac_rfc4231_sha384(doc) ->
+    ["Generate an HMAC using crypto:sha384_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
+     "Testvectors are take from RFC4231." ];
+hmac_rfc4231_sha384(suite) ->
+    [];
+hmac_rfc4231_sha384(Config) when is_list(Config) ->
+    if_supported(sha384, fun() -> hmac_rfc4231_sha384_do() end).
+
+hmac_rfc4231_sha512(doc) ->
+    ["Generate an HMAC using crypto:sha512_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
+     "Testvectors are take from RFC4231." ];
+hmac_rfc4231_sha512(suite) ->
+    [];
+hmac_rfc4231_sha512(Config) when is_list(Config) ->
+    if_supported(sha512, fun() -> hmac_rfc4231_sha512_do() end).
+
+hmac_rfc4231_case(Hash, case1, Exp) ->
+    %% Test 1
+    Key = binary:copy(<<16#0b>>, 20),
+    Data = <<"Hi There">>,
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
+
+hmac_rfc4231_case(Hash, case2, Exp) ->
+    %% Test 2
+    Key = <<"Jefe">>,
+    Data = <<"what do ya want for nothing?">>,
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
+
+hmac_rfc4231_case(Hash, case3, Exp) ->
+    %% Test 3
+    Key = binary:copy(<<16#aa>>, 20),
+    Data = binary:copy(<<16#dd>>, 50),
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
+
+hmac_rfc4231_case(Hash, case4, Exp) ->
+    %% Test 4
+    Key = list_to_binary(lists:seq(1, 16#19)),
+    Data = binary:copy(<<16#cd>>, 50),
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
+
+hmac_rfc4231_case(Hash, case5, Exp) ->
+    %% Test 5
+    Key = binary:copy(<<16#0c>>, 20),
+    Data = <<"Test With Truncation">>,
+    hmac_rfc4231_case(Hash, Key, Data, 16, Exp);
+
+hmac_rfc4231_case(Hash, case6, Exp) ->
+    %% Test 6
+    Key = binary:copy(<<16#aa>>, 131),
+    Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
+
+hmac_rfc4231_case(Hash, case7, Exp) ->
+    %% Test Case 7
+    Key = binary:copy(<<16#aa>>, 131),
+    Data = <<"This is a test using a larger than block-size key and a larger t",
+	     "han block-size data. The key needs to be hashed before being use",
+	     "d by the HMAC algorithm.">>,
+    hmac_rfc4231_case(Hash, Key, Data, Exp).
+
+hmac_rfc4231_case(Hash, Key, Data, Exp) ->
+    ?line Ctx = crypto:hmac_init(Hash, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Mac1 = crypto:hmac_final(Ctx2),
+    ?line Mac3 = crypto:hmac(Hash, Key, Data),
+    ?line m(Exp, Mac1),
+    ?line m(Exp, Mac3).
+
+hmac_rfc4231_case(Hash, Key, Data, Trunc, Exp) ->
+    ?line Ctx = crypto:hmac_init(Hash, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Mac1 = crypto:hmac_final_n(Ctx2, Trunc),
+    ?line Mac3 = crypto:hmac(Hash, Key, Data, Trunc),
+    ?line m(Exp, Mac1),
+    ?line m(Exp, Mac3).
+
+hmac_rfc4231_sha224_do() ->
+    Case1 = hexstr2bin("896fb1128abbdf196832107cd49df33f"
+		       "47b4b1169912ba4f53684b22"),
+    Case2 = hexstr2bin("a30e01098bc6dbbf45690f3a7e9e6d0f"
+		       "8bbea2a39e6148008fd05e44"),
+    Case3 = hexstr2bin("7fb3cb3588c6c1f6ffa9694d7d6ad264"
+		       "9365b0c1f65d69d1ec8333ea"),
+    Case4 = hexstr2bin("6c11506874013cac6a2abc1bb382627c"
+		       "ec6a90d86efc012de7afec5a"),
+    Case5 = hexstr2bin("0e2aea68a90c8d37c988bcdb9fca6fa8"),
+    Case6 = hexstr2bin("95e9a0db962095adaebe9b2d6f0dbce2"
+		       "d499f112f2d2b7273fa6870e"),
+    Case7 = hexstr2bin("3a854166ac5d9f023f54d517d0b39dbd"
+		       "946770db9c2b95c9f6f565d1"),
+    hmac_rfc4231_cases_do(sha224, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+
+hmac_rfc4231_sha256_do() ->
+    Case1 = hexstr2bin("b0344c61d8db38535ca8afceaf0bf12b"
+		       "881dc200c9833da726e9376c2e32cff7"),
+    Case2 = hexstr2bin("5bdcc146bf60754e6a042426089575c7"
+		       "5a003f089d2739839dec58b964ec3843"),
+    Case3 = hexstr2bin("773ea91e36800e46854db8ebd09181a7"
+		       "2959098b3ef8c122d9635514ced565fe"),
+    Case4 = hexstr2bin("82558a389a443c0ea4cc819899f2083a"
+		       "85f0faa3e578f8077a2e3ff46729665b"),
+    Case5 = hexstr2bin("a3b6167473100ee06e0c796c2955552b"),
+    Case6 = hexstr2bin("60e431591ee0b67f0d8a26aacbf5b77f"
+		       "8e0bc6213728c5140546040f0ee37f54"),
+    Case7 = hexstr2bin("9b09ffa71b942fcb27635fbcd5b0e944"
+		       "bfdc63644f0713938a7f51535c3a35e2"),
+    hmac_rfc4231_cases_do(sha256, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+
+hmac_rfc4231_sha384_do() ->
+    Case1 = hexstr2bin("afd03944d84895626b0825f4ab46907f"
+		       "15f9dadbe4101ec682aa034c7cebc59c"
+		       "faea9ea9076ede7f4af152e8b2fa9cb6"),
+    Case2 = hexstr2bin("af45d2e376484031617f78d2b58a6b1b"
+		       "9c7ef464f5a01b47e42ec3736322445e"
+		       "8e2240ca5e69e2c78b3239ecfab21649"),
+    Case3 = hexstr2bin("88062608d3e6ad8a0aa2ace014c8a86f"
+		       "0aa635d947ac9febe83ef4e55966144b"
+		       "2a5ab39dc13814b94e3ab6e101a34f27"),
+    Case4 = hexstr2bin("3e8a69b7783c25851933ab6290af6ca7"
+		       "7a9981480850009cc5577c6e1f573b4e"
+		       "6801dd23c4a7d679ccf8a386c674cffb"),
+    Case5 = hexstr2bin("3abf34c3503b2a23a46efc619baef897"),
+    Case6 = hexstr2bin("4ece084485813e9088d2c63a041bc5b4"
+		       "4f9ef1012a2b588f3cd11f05033ac4c6"
+		       "0c2ef6ab4030fe8296248df163f44952"),
+    Case7 = hexstr2bin("6617178e941f020d351e2f254e8fd32c"
+		       "602420feb0b8fb9adccebb82461e99c5"
+		       "a678cc31e799176d3860e6110c46523e"),
+    hmac_rfc4231_cases_do(sha384, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+
+hmac_rfc4231_sha512_do() ->
+    Case1 = hexstr2bin("87aa7cdea5ef619d4ff0b4241a1d6cb0"
+		       "2379f4e2ce4ec2787ad0b30545e17cde"
+		       "daa833b7d6b8a702038b274eaea3f4e4"
+		       "be9d914eeb61f1702e696c203a126854"),
+    Case2 = hexstr2bin("164b7a7bfcf819e2e395fbe73b56e0a3"
+		       "87bd64222e831fd610270cd7ea250554"
+		       "9758bf75c05a994a6d034f65f8f0e6fd"
+		       "caeab1a34d4a6b4b636e070a38bce737"),
+    Case3 = hexstr2bin("fa73b0089d56a284efb0f0756c890be9"
+		       "b1b5dbdd8ee81a3655f83e33b2279d39"
+		       "bf3e848279a722c806b485a47e67c807"
+		       "b946a337bee8942674278859e13292fb"),
+    Case4 = hexstr2bin("b0ba465637458c6990e5a8c5f61d4af7"
+		       "e576d97ff94b872de76f8050361ee3db"
+		       "a91ca5c11aa25eb4d679275cc5788063"
+		       "a5f19741120c4f2de2adebeb10a298dd"),
+    Case5 = hexstr2bin("415fad6271580a531d4179bc891d87a6"),
+    Case6 = hexstr2bin("80b24263c7c1a3ebb71493c1dd7be8b4"
+		       "9b46d1f41b4aeec1121b013783f8f352"
+		       "6b56d037e05f2598bd0fd2215d6a1e52"
+		       "95e64f73f63f0aec8b915a985d786598"),
+    Case7 = hexstr2bin("e37b6a775dc87dbaa4dfa9f96e5e3ffd"
+		       "debd71f8867289865df5a32d20cdc944"
+		       "b6022cac3c4982b10d5eeb55c3e4de15"
+		       "134676fb6de0446065c97440fa8c6a58"),
+    hmac_rfc4231_cases_do(sha512, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+
+hmac_rfc4231_cases_do(Hash, CasesData) ->
+    hmac_rfc4231_cases_do(Hash, [case1, case2, case3, case4, case5, case6, case7], CasesData).
+
+hmac_rfc4231_cases_do(_Hash, _, []) ->
+    ok;
+hmac_rfc4231_cases_do(Hash, [C|Cases], [D|CasesData]) ->
+    hmac_rfc4231_case(Hash, C, D),
+    hmac_rfc4231_cases_do(Hash, Cases, CasesData).
+
+hmac_update_md5_io(doc) ->
+    ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:md5_mac." ];
+hmac_update_md5_io(suite) ->
+    [];
+hmac_update_md5_io(Config) when is_list(Config) ->
+    ?line Key = ["A fine speach", "by a fine man!"],
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(md5, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final(Ctx3),
+    ?line Exp = crypto:md5_mac(Key, lists:flatten([Data, Data2])), 
+    ?line m(Exp, Mac).
+    
+
+hmac_update_md5_n(doc) ->
+    ["Generate a shortened MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:md5_mac." ];
+hmac_update_md5_n(suite) ->
+    [];
+hmac_update_md5_n(Config) when is_list(Config) ->
+    ?line Key = ["A fine speach", "by a fine man!"],
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(md5, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final_n(Ctx3, 12),
+    ?line Exp = crypto:md5_mac_96(Key, lists:flatten([Data, Data2])), 
+    ?line m(Exp, Mac).
+%%
+%%
+ripemd160(doc) ->
+    ["Generate RIPEMD160 message digests and check the result."];
+ripemd160(suite) ->
+    [];
+ripemd160(Config) when is_list(Config) ->
+    ?line m(crypto:hash(ripemd160,"abc"),
+	    hexstr2bin("8EB208F7E05D987A9B044A8E98C6B087F15A0BFC")),
+    ?line m(crypto:hash(ripemd160,"abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
+			  "nlmnomnopnopq"), 
+	    hexstr2bin("12A053384A9C0C88E405A06C27DCF49ADA62EB2B")).
+
+   
+%%
+%%
+ripemd160_update(doc) ->
+    ["Generate RIPEMD160 message digests by using ripemd160_init,"
+     "ripemd160_update, and ripemd160_final and check the result."];
+ripemd160_update(suite) ->
+    [];
+ripemd160_update(Config) when is_list(Config) ->
+    ?line Ctx = crypto:hash_init(ripemd160),
+    ?line Ctx1 = crypto:hash_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
+    ?line Ctx2 = crypto:hash_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
+    ?line m(crypto:hash_final(Ctx2), 
+      hexstr2bin("12A053384A9C0C88E405A06C27DCF49ADA62EB2B")).
+
+%%
+%%
+sha_update(doc) ->
+    ["Generate SHA message digests by using sha_init, sha_update, and"
+     "sha_final, and check the result. Examples are from FIPS-180-1."];
+sha_update(suite) ->
+    [];
+sha_update(Config) when is_list(Config) ->
+    ?line Ctx = crypto:sha_init(),
+    ?line Ctx1 = crypto:sha_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
+    ?line Ctx2 = crypto:sha_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
+    ?line m(crypto:sha_final(Ctx2), 
+	    hexstr2bin("84983E441C3BD26EBAAE4AA1F95129E5E54670F1")).
+
+%%
+%%
+sha256(doc) ->
+    ["Generate SHA-256 message digests and check the result. Examples are "
+     "from rfc-4634."];
+sha256(suite) ->
+    [];
+sha256(Config) when is_list(Config) ->
+    if_supported(sha256, fun() -> sha256_do() end).
+
+sha256_do() ->
+    ?line m(crypto:hash(sha256, "abc"),
+	    hexstr2bin("BA7816BF8F01CFEA4141"
+		       "40DE5DAE2223B00361A396177A9CB410FF61F20015AD")),
+    ?line m(crypto:hash(sha256, "abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
+			  "nlmnomnopnopq"), 
+	    hexstr2bin("248D6A61D20638B8"
+		       "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1")).
+
+%%
+%%
+sha256_update(doc) ->
+    ["Generate SHA256 message digests by using sha256_init, sha256_update, and"
+     "sha256_final, and check the result. Examples are from rfc-4634."];
+sha256_update(suite) ->
+    [];
+sha256_update(Config) when is_list(Config) ->
+    if_supported(sha256, fun() -> sha256_update_do() end).
+
+sha256_update_do() ->
+    ?line Ctx = crypto:hash_init(sha256),
+    ?line Ctx1 = crypto:hash_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
+    ?line Ctx2 = crypto:hash_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
+    ?line m(crypto:hash_final(Ctx2),
+	    hexstr2bin("248D6A61D20638B8"
+		       "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1")).
+
+
+%%
+%%
+sha512(doc) ->
+    ["Generate SHA-512 message digests and check the result. Examples are "
+     "from rfc-4634."];
+sha512(suite) ->
+    [];
+sha512(Config) when is_list(Config) ->
+    if_supported(sha512, fun() -> sha512_do() end).
+
+sha512_do() ->
+    ?line m(crypto:hash(sha512, "abc"),
+	    hexstr2bin("DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA2"
+		       "0A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD"
+		       "454D4423643CE80E2A9AC94FA54CA49F")),
+    ?line m(crypto:hash(sha512, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+			  "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"), 
+	    hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
+		       "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
+		       "C7D329EEB6DD26545E96E55B874BE909")).
+
+%%
+%%
+sha512_update(doc) ->
+    ["Generate SHA512 message digests by using sha512_init, sha512_update, and"
+     "sha512_final, and check the result. Examples are from rfc=4634."];
+sha512_update(suite) ->
+    [];
+sha512_update(Config) when is_list(Config) ->
+    if_supported(sha512, fun() -> sha512_update_do() end).
+
+sha512_update_do() ->
+    ?line Ctx = crypto:hash_init(sha512),
+    ?line Ctx1 = crypto:hash_update(Ctx, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"),
+    ?line Ctx2 = crypto:hash_update(Ctx1, "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"),
+    ?line m(crypto:hash_final(Ctx2),
+	    hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
+		       "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
+		       "C7D329EEB6DD26545E96E55B874BE909")).
+
+%%
+%%
+md5_mac(doc) ->
+    ["Generate some HMACs, using MD5, and check the result. Examples are "
+     "from RFC-2104."];
+md5_mac(suite) ->
+    [];
+md5_mac(Config) when is_list(Config) ->
+    ?line m(crypto:md5_mac(hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
+			   "Hi There"),
+	    hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d")),
+    ?line m(crypto:md5_mac(list_to_binary("Jefe"), 
+				     "what do ya want for nothing?"),
+	    hexstr2bin("750c783e6ab0b503eaa86e310a5db738")),
+    ?line m(crypto:md5_mac(hexstr2bin("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"),
+			   hexstr2bin("DDDDDDDDDDDDDDDDDDDD"
+				      "DDDDDDDDDDDDDDDDDDDD"
+				      "DDDDDDDDDDDDDDDDDDDD"
+				      "DDDDDDDDDDDDDDDDDDDD"
+				      "DDDDDDDDDDDDDDDDDDDD")),
+	    hexstr2bin("56be34521d144c88dbb8c733f0e8b3f6")).
+
+%%
+%%
+md5_mac_io(doc) ->
+    ["Generate some HMACs, using MD5, with Key an IO-list, and check the "
+     "result. Examples are from RFC-2104."];
+md5_mac_io(suite) ->
+    [];
+md5_mac_io(Config) when is_list(Config) ->
+    ?line Key1 = hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
+    ?line {B11, B12} = split_binary(Key1, 4),
+    ?line Key11 = [B11,binary_to_list(B12)],
+    ?line m(crypto:md5_mac(Key11, "Hi There"),
+	    hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d")).
+
+%%
+%%
+des_cbc(doc) ->
+    "Encrypt and decrypt according to CBC DES. and check the result. "
+	"Example are from FIPS-81.";
+des_cbc(suite) ->
+    [];
+des_cbc(Config) when is_list(Config) ->
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain = "Now is the time for all ",
+    ?line Cipher = crypto:des_cbc_encrypt(Key, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("e5c7cdde872bf27c43e934008c389c"
+			       "0f683788499a7c05f6")),
+    ?line m(list_to_binary(Plain), 
+	    crypto:des_cbc_decrypt(Key, IVec, Cipher)),
+    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
+    ?line Cipher2 = crypto:des_cbc_encrypt(Key, IVec, Plain2),
+    ?line m(Cipher2, hexstr2bin("b9916b8ee4c3da64b4f44e3cbefb9"
+				"9484521388fa59ae67d58d2e77e86062733")),
+    ?line m(list_to_binary(Plain2), 
+	    crypto:des_cbc_decrypt(Key, IVec, Cipher2)).
+
+%%
+%%
+des_cbc_iter(doc) ->
+        "Encrypt and decrypt according to CBC DES in two steps, and "
+    "check the result. Example are from FIPS-81.";
+des_cbc_iter(suite) ->
+    [];
+des_cbc_iter(Config) when is_list(Config) ->
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain1 = "Now is the time ",
+    ?line Plain2 = "for all ",
+    ?line Cipher1 = crypto:des_cbc_encrypt(Key, IVec, Plain1),
+    ?line IVec2 = crypto:des_cbc_ivec(Cipher1),
+    ?line Cipher2 = crypto:des_cbc_encrypt(Key, IVec2, Plain2),
+    ?line Cipher = list_to_binary([Cipher1, Cipher2]),
+    ?line m(Cipher, hexstr2bin("e5c7cdde872bf27c43e934008c389c"
+			             "0f683788499a7c05f6")).
+
+%%
+%%
+des_cfb(doc) ->
+    "Encrypt and decrypt according to CFB DES. and check the result. "
+	"Example is from FIPS-81.";
+des_cfb(suite) ->
+    [];
+des_cfb(Config) when is_list(Config) ->
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain = "Now is the",
+    ?line Cipher = crypto:des_cfb_encrypt(Key, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("f31fda07011462ee187f")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des_cfb_decrypt(Key, IVec, Cipher)).
+
+%%
+%%
+des_cfb_iter(doc) ->
+        "Encrypt and decrypt according to CFB DES in two steps, and "
+    "check the result. Example is from FIPS-81.";
+des_cfb_iter(suite) ->
+    [];
+des_cfb_iter(Config) when is_list(Config) ->
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain1 = "Now i",
+    ?line Plain2 = "s the",
+    ?line Cipher1 = crypto:des_cfb_encrypt(Key, IVec, Plain1),
+    ?line IVec2 = crypto:des_cfb_ivec(IVec, Cipher1),
+    ?line Cipher2 = crypto:des_cfb_encrypt(Key, IVec2, Plain2),
+    ?line Cipher = list_to_binary([Cipher1, Cipher2]),
+    ?line m(Cipher, hexstr2bin("f31fda07011462ee187f")).
+
+%%
+%%
+des_ecb(doc) ->
+    "Encrypt and decrypt according to ECB DES and check the result. "
+    "Example are from FIPS-81.";
+des_ecb(suite) ->
+    [];
+des_ecb(Config) when is_list(Config) ->
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line Cipher1 = crypto:des_ecb_encrypt(Key, "Now is t"),
+    ?line m(Cipher1, hexstr2bin("3fa40e8a984d4815")),
+    ?line Cipher2 = crypto:des_ecb_encrypt(Key, "he time "),
+    ?line m(Cipher2, hexstr2bin("6a271787ab8883f9")),
+    ?line Cipher3 = crypto:des_ecb_encrypt(Key, "for all "),
+    ?line m(Cipher3, hexstr2bin("893d51ec4b563b53")),
+    ?line Cipher4 = crypto:des_ecb_decrypt(Key, hexstr2bin("3fa40e8a984d4815")),
+    ?line m(Cipher4, <<"Now is t">>),
+    ?line Cipher5 = crypto:des_ecb_decrypt(Key, hexstr2bin("6a271787ab8883f9")),
+    ?line m(Cipher5, <<"he time ">>),
+    ?line Cipher6 = crypto:des_ecb_decrypt(Key, hexstr2bin("893d51ec4b563b53")),
+    ?line m(Cipher6, <<"for all ">>).
+%%
+%%
+rc2_cbc(doc) ->
+    "Encrypt and decrypt according to RC2 CBC and check the result. "
+    "Example stripped out from public_key application test";
+rc2_cbc(Config) when is_list(Config) ->
+   
+    Key = <<146,210,160,124,215,227,153,239,227,17,222,140,3,93,27,191>>,
+    IV = <<72,91,135,182,25,42,35,210>>,
+
+    Cipher = <<36,245,206,158,168,230,58,69,148,137,32,192,250,41,237,181,181,251, 192,2,175,135,177,171,57,30,111,117,159,149,15,28,88,158,28,81,28,115, 85,219,241,82,117,222,91,85,73,117,164,25,182,52,191,64,123,57,26,19, 211,27,253,31,194,219,231,104,247,240,172,130,119,21,225,154,101,247, 32,216,42,216,133,169,78,22,97,27,227,26,196,224,172,168,17,9,148,55, 203,91,252,40,61,226,236,221,215,160,78,63,13,181,68,57,196,241,185, 207, 116,129,152,237,60,139,247,153,27,146,161,246,222,98,185,222,152, 187,135, 236,86,34,7,110,91,230,173,34,160,242,202,222,121,127,181,140, 101,203,195, 190,88,250,86,147,127,87,72,126,171,16,71,47,110,248,88, 14,29,143,161,152, 129,236,148,22,152,186,208,119,70,8,174,193,203,100, 193,203,200,117,102,242, 134,142,96,125,135,200,217,190,76,117,50,70, 209,186,101,241,200,91,40,193,54, 90,195,38,47,59,197,38,234,86,223,16, 51,253,204,129,20,171,66,21,241,26,135,216, 196,114,110,91,15,53,40, 164,201,136,113,95,247,51,181,208,241,68,168,98,151,36, 155,72,24,57, 42,191,14,125,204,10,167,214,233,138,115,125,234,121,134,227,26,247, 77,200,117,110,117,111,168,156,206,67,159,149,189,173,150,193,91,199, 216,153,22, 189,137,185,89,160,13,131,132,58,109,28,110,246,252,251,14, 232,91,38,52,29,101,188,69,123,50,0,130,178,93,73,239,118,7,77,35,59, 253,10,159,45,86,142,37,78,232,48>>,
+    Text = <<48,130,1,85,2,1,0,48,13,6,9,42,134,72,134,247,13,1,1,1,5,0,4,130,1,63,48,130, 1,59,2,1,0,2,65,0,222,187,252,44,9,214,27,173,162,169,70,47,36,34,78,84,204, 107,60,192,117,95,21,206,49,142,245,126,121,223,23,2,107,106,133,204,161,36, 40,2,114,69,4,93,242,5,42,50,154,47,154,211,209,123,120,161,5,114,173,155,34, 191,52,59,2,3,1,0,1,2,64,45,144,169,106,220,236,71,39,67,82,123,192,35,21,61, 143,13,110,150,180,12,142,210,40,39,109,70,125,132,51,6,66,159,134,112,85, 155,243,118,221,65,133,127,99,151,194,252,141,149,224,229,62,214,45,228,32, 184,85,67,14,228,161,184,161,2,33,0,255,202,240,131,130,57,49,224,115,255,83, 79,6,165,212,21,179,212,20,188,97,74,69,68,163,223,247,237,39,24,23,235,2,33, 0,222,234,48,36,33,23,219,45,59,136,55,245,143,29,165,48,255,131,207,146,131, 104,13,163,54,131,236,78,88,54,16,241,2,33,0,230,2,99,129,173,176,166,131, 241,106,143,76,9,107,70,41,121,185,228,39,124,200,159,62,216,169,5,180,111, 169,255,159,2,33,0,151,193,70,212,209,210,179,219,175,83,165,4,255,81,103,76, 92,39,24,0,222,132,208,3,244,241,10,198,171,54,227,129,2,32,43,250,20,31,16, 189,168,116,225,1,125,132,94,130,118,124,28,56,232,39,69,218,244,33,240,200, 205,9,215,101,35,135,7,7,7,7,7,7,7>>,
+    
+    Text = crypto:rc2_cbc_decrypt(Key, IV, Cipher),
+    Cipher = crypto:rc2_cbc_encrypt(Key, IV, Text).
+
+%%
+%%
+des3_cbc(doc) ->
+    "Encrypt and decrypt according to CBC 3DES, and check the result.";
+des3_cbc(suite) ->
+    [];
+des3_cbc(Config) when is_list(Config) ->
+    ?line Key1 = hexstr2bin("0123456789abcdef"),
+    ?line Key2 = hexstr2bin("fedcba9876543210"),
+    ?line Key3 = hexstr2bin("0f2d4b6987a5c3e1"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain = "Now is the time for all ",
+    ?line Cipher = crypto:des3_cbc_encrypt(Key1, Key2, Key3, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("8a2667ee5577267cd9b1af2c5a0480"
+			       "0bac1ae66970fb2b89")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des3_cbc_decrypt(Key1, Key2, Key3, IVec, Cipher)),
+    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
+    ?line Cipher2 = crypto:des3_cbc_encrypt(Key1, Key2, Key3, IVec, Plain2),
+    ?line m(Cipher2, hexstr2bin("eb33ec6ede2c8e90f6877e77b95d5"
+				"4c83cee22907f7f0041ca1b7abe202bfafe")),
+    ?line m(list_to_binary(Plain2),
+	    crypto:des3_cbc_decrypt(Key1, Key2, Key3, IVec, Cipher2)),
+
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line DESCipher = crypto:des3_cbc_encrypt(Key, Key, Key, IVec, Plain),
+    ?line m(DESCipher, hexstr2bin("e5c7cdde872bf27c43e934008c389c"
+			       "0f683788499a7c05f6")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des3_cbc_decrypt(Key, Key, Key, IVec, DESCipher)),
+    ?line DESCipher2 = crypto:des3_cbc_encrypt(Key, Key, Key, IVec, Plain2),
+    ?line m(DESCipher2, hexstr2bin("b9916b8ee4c3da64b4f44e3cbefb9"
+				"9484521388fa59ae67d58d2e77e86062733")),
+    ?line m(list_to_binary(Plain2),
+	    crypto:des3_cbc_decrypt(Key, Key, Key, IVec, DESCipher2)).
+
+%%
+%%
+des3_cfb(doc) ->
+    "Encrypt and decrypt according to CFB 3DES, and check the result.";
+des3_cfb(suite) ->
+    [];
+des3_cfb(Config) when is_list(Config) ->
+    case openssl_version() of
+	V when V < 16#90705F -> {skipped,"OpenSSL version too old"};
+	_ -> des3_cfb_do()
+    end.
+
+des3_cfb_do() ->
+    ?line Key1 = hexstr2bin("0123456789abcdef"),
+    ?line Key2 = hexstr2bin("fedcba9876543210"),
+    ?line Key3 = hexstr2bin("0f2d4b6987a5c3e1"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain = "Now is the time for all ",
+    ?line Cipher = crypto:des3_cfb_encrypt(Key1, Key2, Key3, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("fc0ba7a20646ba53cc8bff263f0937"
+			       "1deab42a00666db02c")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des3_cfb_decrypt(Key1, Key2, Key3, IVec, Cipher)),
+    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
+    ?line Cipher2 = crypto:des3_cfb_encrypt(Key1, Key2, Key3, IVec, Plain2),
+    ?line m(Cipher2, hexstr2bin("8582c59ac01897422632c0accb66c"
+				"e413f5efab838fce7e41e2ba67705bad5bc")),
+    ?line m(list_to_binary(Plain2),
+	    crypto:des3_cfb_decrypt(Key1, Key2, Key3, IVec, Cipher2)).
+
+%%
+%%
+aes_cfb(doc) ->
+    "Encrypt and decrypt according to AES CFB 128 bit and check "
+	"the result. Example are from NIST SP 800-38A.";
+
+aes_cfb(suite) ->
+    [];
+aes_cfb(Config) when is_list(Config) ->
+
+%% Sample data from NIST Spec.Publ. 800-38A
+%% F.3.13 CFB128-AES128.Encrypt
+%% Key            2b7e151628aed2a6abf7158809cf4f3c
+%% IV             000102030405060708090a0b0c0d0e0f
+%% Segment #1
+%% Input Block    000102030405060708090a0b0c0d0e0f
+%% Output Block   50fe67cc996d32b6da0937e99bafec60
+%% Plaintext      6bc1bee22e409f96e93d7e117393172a
+%% Ciphertext     3b3fd92eb72dad20333449f8e83cfb4a
+%% Segment #2
+%% Input Block    3b3fd92eb72dad20333449f8e83cfb4a
+%% Output Block   668bcf60beb005a35354a201dab36bda
+%% Plaintext      ae2d8a571e03ac9c9eb76fac45af8e51
+%% Ciphertext     c8a64537a0b3a93fcde3cdad9f1ce58b
+%% Segment #3
+%% Input Block    c8a64537a0b3a93fcde3cdad9f1ce58b
+%% Output Block   16bd032100975551547b4de89daea630
+%% Plaintext      30c81c46a35ce411e5fbc1191a0a52ef
+%% Ciphertext     26751f67a3cbb140b1808cf187a4f4df
+%% Segment #4
+%% Input Block    26751f67a3cbb140b1808cf187a4f4df
+%% Output Block   36d42170a312871947ef8714799bc5f6
+%% Plaintext      f69f2445df4f9b17ad2b417be66c3710
+%% Ciphertext     c04b05357c5d1c0eeac4c66f9ff7f2e6
+
+    ?line Key =  hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
+    ?line IVec = hexstr2bin("000102030405060708090a0b0c0d0e0f"),
+    ?line Plain = hexstr2bin("6bc1bee22e409f96e93d7e117393172a"),
+    ?line Cipher = hexstr2bin("3b3fd92eb72dad20333449f8e83cfb4a"),
+
+    %% Try all prefixes of plain and cipher.
+    aes_cfb_do(byte_size(Plain), Plain, Cipher, Key, IVec).
+
+aes_cfb_do(N, Plain, Cipher, Key, IVec) when N >= 0 ->
+    <<P:N/binary, _/binary>> = Plain,
+    <<C:N/binary, _/binary>> = Cipher,
+    ?line C = crypto:aes_cfb_128_encrypt(Key, IVec, P),
+    ?line P = crypto:aes_cfb_128_decrypt(Key, IVec, C),
+    aes_cfb_do(N-1, Plain, Cipher, Key, IVec);
+aes_cfb_do(_, _, _, _, _) -> ok.
+
+
+%%
+%%
+aes_cbc(doc) ->
+    "Encrypt and decrypt according to AES CBC 128 bit. and check the result. "
+	"Example are from NIST SP 800-38A.";
+
+aes_cbc(suite) ->
+    [];
+aes_cbc(Config) when is_list(Config) ->
+
+%% Sample data from NIST Spec.Publ. 800-38A
+%% F.2.1 CBC-AES128.Encrypt
+%% Key 2b7e151628aed2a6abf7158809cf4f3c 
+%% IV 000102030405060708090a0b0c0d0e0f 
+%% Block #1 
+%% Plaintext 6bc1bee22e409f96e93d7e117393172a 
+%% Input Block 6bc0bce12a459991e134741a7f9e1925 
+%% Output Block 7649abac8119b246cee98e9b12e9197d 
+%% Ciphertext 7649abac8119b246cee98e9b12e9197d 
+%% Block #2 
+%% Plaintext ae2d8a571e03ac9c9eb76fac45af8e51 
+%% Input Block d86421fb9f1a1eda505ee1375746972c 
+%% Output Block 5086cb9b507219ee95db113a917678b2 
+%% Ciphertext 5086cb9b507219ee95db113a917678b2 
+%% Block #3 
+%% Plaintext 30c81c46a35ce411e5fbc1191a0a52ef 
+%% Input Block 604ed7ddf32efdff7020d0238b7c2a5d 
+%% Output Block 73bed6b8e3c1743b7116e69e22229516 
+%% Ciphertext 73bed6b8e3c1743b7116e69e22229516 
+%% Block #4 
+%% Plaintext f69f2445df4f9b17ad2b417be66c3710 
+%% Input Block 8521f2fd3c8eef2cdc3da7e5c44ea206 
+%% Output Block 3ff1caa1681fac09120eca307586e1a7 
+%% Ciphertext 3ff1caa1681fac09120eca307586e1a7 
+%%
+%% F.2.2 CBC-AES128.Decrypt 
+%% Key 2b7e151628aed2a6abf7158809cf4f3c 
+%% IV 000102030405060708090a0b0c0d0e0f 
+    %% Block #1 
+%% Ciphertext 7649abac8119b246cee98e9b12e9197d 
+%% Input Block 7649abac8119b246cee98e9b12e9197d 
+%% Output Block 6bc0bce12a459991e134741a7f9e1925 
+%% Plaintext 6bc1bee22e409f96e93d7e117393172a 
+%% Block #2 
+%% Ciphertext 5086cb9b507219ee95db113a917678b2 
+%% Input Block 5086cb9b507219ee95db113a917678b2 
+%% Output Block d86421fb9f1a1eda505ee1375746972c 
+%% Plaintext ae2d8a571e03ac9c9eb76fac45af8e51 
+%% Block #3 
+%% Ciphertext 73bed6b8e3c1743b7116e69e22229516 
+%% Input Block 73bed6b8e3c1743b7116e69e22229516 
+%% Output Block 604ed7ddf32efdff7020d0238b7c2a5d 
+%% Plaintext 30c81c46a35ce411e5fbc1191a0a52ef 
+%% Block #4 
+%% Ciphertext 3ff1caa1681fac09120eca307586e1a7 
+%% Input Block 3ff1caa1681fac09120eca307586e1a7
+%% Output Block 8521f2fd3c8eef2cdc3da7e5c44ea206 
+%% Plaintext f69f2445df4f9b17ad2b417be66c3710
+
+    ?line Key =  hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
+    ?line IVec = hexstr2bin("000102030405060708090a0b0c0d0e0f"),
+    ?line Plain = hexstr2bin("6bc1bee22e409f96e93d7e117393172a"),
+    ?line Cipher = crypto:aes_cbc_128_encrypt(Key, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("7649abac8119b246cee98e9b12e9197d")),
+    ?line m(Plain, 
+	    crypto:aes_cbc_128_decrypt(Key, IVec, Cipher)).
+
+aes_cbc_iter(doc) ->
+    "Encrypt and decrypt according to CBC AES in steps";
+aes_cbc_iter(suite) -> [];
+aes_cbc_iter(Config) when is_list(Config) ->
+    Key = list_to_binary(lists:seq(255,256-16*17,-17)),
+    IVec = list_to_binary(lists:seq(1,16*7,7)),
+    Plain = <<"One, two, three o'clock, four o'clock, rock"
+	     "Five, six, seven o'clock, eight o'clock, rock"
+	     "Nine, ten, eleven o'clock, twelve o'clock, rock"
+	     "We're gonna rock around the clock tonight">>,
+    ?line 0 = size(Plain) rem 16,
+
+    ?line Cipher = crypto:aes_cbc_128_encrypt(Key, IVec, Plain),
+    ?line Plain = crypto:aes_cbc_128_decrypt(Key, IVec, Cipher),
+    
+    ?line Cipher = aes_cbc_encrypt_iter(Key,IVec,Plain,<<>>),
+    ?line Plain = aes_cbc_decrypt_iter(Key,IVec,Cipher,<<>>),
+    ok.
+
+aes_cbc_encrypt_iter(_,_,<<>>, Acc) ->
+    Acc;
+aes_cbc_encrypt_iter(Key,IVec,Data, Acc) ->
+    Bytes = 16 * (1 + size(Data) div (16*3)),
+    <<Chunk:Bytes/binary, Rest/binary>> = Data,
+    %%io:format("encrypt iter Chunk=~p Rest=~p\n",[Chunk,Rest]),
+    ?line Cipher = crypto:aes_cbc_128_encrypt(Key, IVec, Chunk),
+    ?line IVec2 = crypto:aes_cbc_ivec(Cipher),
+    aes_cbc_encrypt_iter(Key,IVec2,Rest, <<Acc/binary, Cipher/binary>>).
+
+aes_cbc_decrypt_iter(_,_,<<>>, Acc) ->
+    Acc;
+aes_cbc_decrypt_iter(Key,IVec,Data, Acc) ->
+    Bytes = 16 * (1 + size(Data) div (16*5)),
+    <<Chunk:Bytes/binary, Rest/binary>> = Data,
+    %%io:format("decrypt iter Chunk=~p Rest=~p\n",[Chunk,Rest]),
+    ?line Plain = crypto:aes_cbc_128_decrypt(Key, IVec, Chunk),
+    ?line IVec2 = crypto:aes_cbc_ivec(Chunk),
+    aes_cbc_decrypt_iter(Key,IVec2,Rest, <<Acc/binary, Plain/binary>>).
+
+
+aes_ctr(doc) -> "CTR";
+aes_ctr(Config) when is_list(Config) ->
+    %% Sample data from NIST Spec.Publ. 800-38A
+    %% F.5.1 CTR-AES128.Encrypt
+    Key128 = hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
+    Samples128 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", % Input Block
+                   "6bc1bee22e409f96e93d7e117393172a", % Plaintext
+                   "874d6191b620e3261bef6864990db6ce"},% Ciphertext
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                   "ae2d8a571e03ac9c9eb76fac45af8e51",
+                   "9806f66b7970fdff8617187bb9fffdff"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                   "30c81c46a35ce411e5fbc1191a0a52ef",
+                   "5ae4df3edbd5d35e5b4f09020db03eab"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                   "f69f2445df4f9b17ad2b417be66c3710",
+                   "1e031dda2fbe03d1792170a0f3009cee"}],
+    lists:foreach(fun(S) -> aes_ctr_do(Key128,S) end, Samples128),
+
+    %% F.5.3  CTR-AES192.Encrypt
+    Key192 =  hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
+    Samples192 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", % Input Block
+                   "6bc1bee22e409f96e93d7e117393172a", % Plaintext
+                   "1abc932417521ca24f2b0459fe7e6e0b"},% Ciphertext
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                   "ae2d8a571e03ac9c9eb76fac45af8e51",
+                   "090339ec0aa6faefd5ccc2c6f4ce8e94"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                   "30c81c46a35ce411e5fbc1191a0a52ef",
+                   "1e36b26bd1ebc670d1bd1d665620abf7"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                   "f69f2445df4f9b17ad2b417be66c3710",
+                   "4f78a7f6d29809585a97daec58c6b050"}],    
+    lists:foreach(fun(S) -> aes_ctr_do(Key192,S) end, Samples192),
+
+    %% F.5.5  CTR-AES256.Encrypt
+    Key256 = hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+    Samples256 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",  % Input Block
+                    "6bc1bee22e409f96e93d7e117393172a", % Plaintext
+                    "601ec313775789a5b7a7f504bbf3d228"},% Ciphertext
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                    "ae2d8a571e03ac9c9eb76fac45af8e51",
+                    "f443e3ca4d62b59aca84e990cacaf5c5"},
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                    "30c81c46a35ce411e5fbc1191a0a52ef",
+                    "2b0930daa23de94ce87017ba2d84988d"},
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                    "f69f2445df4f9b17ad2b417be66c3710",
+                    "dfc9c58db67aada613c2dd08457941a6"}],
+    lists:foreach(fun(S) -> aes_ctr_do(Key256,S) end, Samples256).
+
+
+aes_ctr_do(Key,{IVec, Plain, Cipher}) ->
+    ?line I = hexstr2bin(IVec),
+    ?line P = hexstr2bin(Plain),
+    ?line C = crypto:aes_ctr_encrypt(Key, I, P),
+    ?line m(C, hexstr2bin(Cipher)),
+    ?line m(P, crypto:aes_ctr_decrypt(Key, I, C)).
+
+aes_ctr_stream(doc) -> "CTR Streaming";
+aes_ctr_stream(Config) when is_list(Config) ->
+    %% Sample data from NIST Spec.Publ. 800-38A
+    %% F.5.1 CTR-AES128.Encrypt
+    Key128 = hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
+    Samples128 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",       % Input Block
+                   ["6bc1bee22e409f", "96e93d7e117393172a"], % Plaintext
+                   ["874d6191b620e3261bef6864990db6ce"]},    % Ciphertext
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                   ["ae2d8a57", "1e03ac9c", "9eb76fac", "45af8e51"],
+                   ["9806f66b7970fdff","8617187bb9fffdff"]},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                   ["30c81c46a35c", "e411e5fbc119", "1a0a52ef"],
+                   ["5ae4df3e","dbd5d3","5e5b4f0902","0db03eab"]},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                   ["f69f2445df4f9b17ad2b417be66c3710"],
+                   ["1e031dda2fbe","03d1792170a0","f3009cee"]}],
+    lists:foreach(fun(S) -> aes_ctr_stream_do(Key128,S) end, Samples128),
+
+    %% F.5.3  CTR-AES192.Encrypt
+    Key192 =  hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
+    Samples192 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",   % Input Block
+                   ["6bc1bee22e409f96e93d7e117393172a"], % Plaintext
+                   ["1abc9324","17521c","a24f2b04","59fe7e6e0b"]},  % Ciphertext
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                   ["ae2d8a57", "1e03ac9c9eb76fac", "45af8e51"],
+                   ["090339ec0aa6faefd5ccc2c6f4ce8e94"]},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                   ["30c81c46a35ce411", "e5fbc1191a0a52ef"],
+                   ["1e36b26bd1","ebc670d1bd1d","665620abf7"]},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                   ["f69f2445", "df4f9b17ad", "2b417be6", "6c3710"],
+                   ["4f78a7f6d2980958","5a97daec58c6b050"]}],    
+    lists:foreach(fun(S) -> aes_ctr_stream_do(Key192,S) end, Samples192),
+
+    %% F.5.5  CTR-AES256.Encrypt
+    Key256 = hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+    Samples256 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",         % Input Block
+                    ["6bc1bee22e409f96", "e93d7e117393172a"],  % Plaintext
+                    ["601ec313775789", "a5b7a7f504bbf3d228"]}, % Ciphertext
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                    ["ae2d8a571e03ac9c9eb76fac45af8e51"],
+                    ["f443e3ca","4d62b59aca84","e990cacaf5c5"]},
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                    ["30c81c46","a35ce411","e5fbc119","1a0a52ef"],
+                    ["2b0930daa23de94ce87017ba2d84988d"]},
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                    ["f69f2445df4f","9b17ad2b41","7be66c3710"],
+                    ["dfc9c5","8db67aada6","13c2dd08","457941a6"]}],
+    lists:foreach(fun(S) -> aes_ctr_stream_do(Key256,S) end, Samples256).
+
+
+aes_ctr_stream_do(Key,{IVec, PlainList, CipherList}) ->
+    ?line I = hexstr2bin(IVec),
+    ?line S = crypto:aes_ctr_stream_init(Key, I),
+    ?line C = aes_ctr_stream_do_iter(
+                S, PlainList, [], 
+                fun(S2,P) -> crypto:aes_ctr_stream_encrypt(S2, P) end),
+    ?line m(C, hexstr2bin(lists:flatten(CipherList))),
+    ?line P = aes_ctr_stream_do_iter(
+                S, CipherList, [], 
+                fun(S2,C2) -> crypto:aes_ctr_stream_decrypt(S2, C2) end),
+    ?line m(P, hexstr2bin(lists:flatten(PlainList))).
+
+aes_ctr_stream_do_iter(_State, [], Acc, _CipherFun) ->
+    iolist_to_binary(lists:reverse(Acc));
+aes_ctr_stream_do_iter(State, [Plain|Rest], Acc, CipherFun) ->
+    ?line P = hexstr2bin(Plain),
+    ?line {S2, C} = CipherFun(State, P),
+    aes_ctr_stream_do_iter(S2, Rest, [C | Acc], CipherFun).
+
+%%
+%%
+mod_exp_test(doc) ->
+    "mod_exp testing (A ^ M % P with bignums)";
+mod_exp_test(suite) ->
+    [];
+mod_exp_test(Config) when is_list(Config) ->
+    mod_exp_aux_test(2, 5, 10, 8).
+
+mod_exp_aux_test(_, _, _, 0) ->
+    ok;
+mod_exp_aux_test(B, E, M, N) ->
+    ?line R1 = crypto:mod_exp(B, E, M),
+    ?line R2 = ipow(B, E, M),
+    ?line m(R1, R2),
+    ?line mod_exp_aux_test(B, E*E+1, M*M+1, N-1).
+
+%%
+%%
+rand_uniform_test(doc) ->
+    "rand_uniform and random_bytes testing";
+rand_uniform_test(suite) ->
+    [];
+rand_uniform_test(Config) when is_list(Config) ->
+    rand_uniform_aux_test(10),
+    ?line 10 = size(crypto:rand_bytes(10)).
+
+rand_uniform_aux_test(0) ->
+    ok;
+rand_uniform_aux_test(N) ->
+    ?line L = N*1000,
+    ?line H = N*100000+1,
+    ?line crypto_rand_uniform(L, H),
+    ?line crypto_rand_uniform(-L, L),
+    ?line crypto_rand_uniform(-H, -L),
+    ?line crypto_rand_uniform(-H, L),
+    ?line rand_uniform_aux_test(N-1).
+
+crypto_rand_uniform(L,H) ->
+    ?line R1 = crypto:rand_uniform(L, H),
+    ?line t(R1 >= L),
+    ?line t(R1 < H).
+
+
+%%
+%%
+strong_rand_test(doc) ->
+    "strong_rand_mpint and strong_random_bytes testing";
+strong_rand_test(suite) ->
+    [];
+strong_rand_test(Config) when is_list(Config) ->
+    strong_rand_aux_test(180),
+    ?line 10 = byte_size(crypto:strong_rand_bytes(10)).
+
+strong_rand_aux_test(0) ->
+    ?line t(crypto:strong_rand_mpint(0,0,0) =:= <<0,0,0,0>>),
+    ok;
+strong_rand_aux_test(1) ->
+    ?line t(crypto:erlint(crypto:strong_rand_mpint(1,0,1)) =:= 1),
+    ?line strong_rand_aux_test(0);
+strong_rand_aux_test(N) ->
+    ?line t(sru_length(crypto:strong_rand_mpint(N,-1,0)) =< N),
+    ?line t(sru_length(crypto:strong_rand_mpint(N,0,0)) =:= N),
+    ?line t(crypto:erlint(crypto:strong_rand_mpint(N,0,1)) band 1 =:= 1),
+    ?line t(crypto:erlint(crypto:strong_rand_mpint(N,1,0)) bsr (N - 2) =:= 2#11),
+    ?line strong_rand_aux_test(N-1).
+
+sru_length(Mpint) ->
+    I = crypto:erlint(Mpint),
+    length(erlang:integer_to_list(I, 2)).
+
+%%
+%%
+%%
+%%
+rsa_verify_test(doc) ->
+    "rsa_verify testing (A ^ M % P with bignums)";
+rsa_verify_test(suite) ->
+    [];
+rsa_verify_test(Config) when is_list(Config) ->
+    ?line H = <<178,28,54,104,36,80,144,66,140,201,135,17,36,97,114,124,
+	       194,164,172,147>>,
+    ?line SigBlob = <<153,44,121,71,132,1,192,159,78,33,29,62,153,64,191,70,
+		     208,239,166,208,220,167,49,111,128,67,91,253,24,63,194,241,
+		     97,157,135,226,121,162,150,156,60,49,236,90,151,67,239,23,
+		     92,103,89,254,17,165,78,181,64,128,13,210,86,111,209,76,
+		     115,34,107,227,151,47,80,185,143,85,202,55,245,163,226,26,
+		     139,104,196,6,96,82,108,197,13,0,12,70,153,109,107,180,
+		     130,246,156,182,56,96,31,220,227,218,136,211,252,43,8,14,
+		     145,155,191,206,72,194,80,52,54,206,53,27,6,188,195,29>>,
+    ?line BadSigBlob = <<153,44,121,71,132,1,192,159,78,33,29,62,153,64,191,70,
+			208,239,166,208,220,167,49,111,128,67,91,253,24,63,194,241,
+			97,157,135,226,121,162,150,156,60,49,236,90,151,67,239,23,
+			92,103,89,254,17,165,78,181,64,128,13,210,86,111,209,76,
+			115,107,34,227,151,47,80,185,143,85,202,55,245,163,226,26,
+			139,104,196,6,96,82,108,197,13,0,12,70,153,109,107,180,
+			130,246,156,182,56,96,31,220,227,218,136,211,252,43,8,14,
+			145,155,191,206,72,194,80,52,54,206,53,27,6,188,195,29>>,
+    ?line E = <<35>>,
+    ?line N = <<0,199,209,142,191,86,92,148,103,37,250,217,175,169,109,10,
+	       130,139,34,237,174,90,97,118,7,185,57,137,252,236,177,193,
+	       228,16,62,29,153,144,64,207,152,240,152,206,136,89,64,6,
+	       3,187,89,57,241,219,88,215,75,70,120,20,145,229,37,1,
+	       67,138,204,17,39,231,249,239,116,142,169,99,149,41,65,123,
+	       26,225,133,0,41,85,77,181,35,100,162,223,92,220,207,50,
+	       63,168,193,171,174,199,23,214,201,63,157,76,125,6,54,73,
+	       76,89,40,33,147,208,189,76,98,24,61,8,10,110,165,119,165>>,
+    ?line Nbad = <<0,199,209,142,191,86,92,148,103,37,250,217,175,169,109,10,
+		  130,139,34,237,174,90,97,118,7,185,57,137,252,236,177,193,
+		  228,16,62,29,153,144,64,207,152,240,152,206,136,89,64,6,
+		  3,187,89,57,241,219,88,215,75,70,120,20,145,229,37,1,
+		  67,138,204,17,39,231,249,239,116,142,169,99,149,41,65,123,
+		  26,225,133,0,41,85,77,181,35,100,162,223,92,220,207,50,
+		  63,168,193,171,174,199,23,214,201,63,157,76,125,6,54,73,
+		  76,89,40,33,147,189,208,76,98,24,61,8,10,110,165,119,165>>,
+    ?line Ebad = <<77>>,
+    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(SigBlob),
+			      [sized_binary(E), sized_binary(N)]), true),
+    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(SigBlob),
+			      [sized_binary(Ebad), sized_binary(N)]), false),
+    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(SigBlob),
+			      [sized_binary(E), sized_binary(Nbad)]), false),
+    ?line m(crypto:rsa_verify(sized_binary(H), sized_binary(BadSigBlob),
+			      [sized_binary(E), sized_binary(N)]), false).
+
+%%
+%%
+dsa_verify_test(doc) ->
+    "dsa_verify testing (A ^ M % P with bignums)";
+dsa_verify_test(suite) ->
+    [];
+dsa_verify_test(Config) when is_list(Config) ->
+    ?line Msg = <<48,130,2,245,160,3,2,1,2,2,1,1,48,9,6,7,42,134,72,206,56,4,3,48,
+		 58,49,11,48,9,6,3,85,4,6,19,2,85,83,49,26,48,24,6,3,85,4,10,19,17,
+		 84,101,115,116,32,67,101,114,116,105,102,105,99,97,116,101,115,49,
+		 15,48,13,6,3,85,4,3,19,6,68,83,65,32,67,65,48,30,23,13,48,49,48,
+		 52,49,57,49,52,53,55,50,48,90,23,13,49,49,48,52,49,57,49,52,53,55,
+		 50,48,90,48,93,49,11,48,9,6,3,85,4,6,19,2,85,83,49,26,48,24,6,3,
+		 85,4,10,19,17,84,101,115,116,32,67,101,114,116,105,102,105,99,97,
+		 116,101,115,49,50,48,48,6,3,85,4,3,19,41,86,97,108,105,100,32,68,
+		 83,65,32,83,105,103,110,97,116,117,114,101,115,32,69,69,32,67,101,
+		 114,116,105,102,105,99,97,116,101,32,84,101,115,116,52,48,130,1,
+		 182,48,130,1,43,6,7,42,134,72,206,56,4,1,48,130,1,30,2,129,129,0,
+		 228,139,175,64,140,21,215,61,124,238,3,150,18,104,193,32,5,232,23,
+		 202,158,116,101,75,154,84,151,42,120,51,218,165,197,114,234,52,
+		 179,148,104,66,213,27,253,119,240,168,66,158,100,147,144,182,194,
+		 2,49,70,19,122,3,105,204,152,45,86,157,94,35,95,40,191,173,127,15,
+		 208,105,149,98,92,26,7,42,94,140,115,73,126,253,18,34,142,85,229,
+		 86,233,174,114,41,150,135,8,39,215,119,67,240,134,184,9,10,27,20,
+		 165,230,3,230,69,121,77,233,250,83,95,193,9,189,126,197,195,2,21,
+		 0,128,63,228,252,243,76,229,62,203,15,23,10,42,84,108,208,103,108,
+		 13,59,2,129,128,102,212,22,138,32,173,254,209,50,159,165,127,167,
+		 179,208,234,119,63,235,108,162,228,41,216,216,188,33,221,154,247,
+		 204,229,180,119,77,223,236,218,162,140,156,117,18,90,31,254,102,
+		 211,17,194,239,132,67,236,169,136,110,76,186,76,63,53,150,199,103,
+		 252,153,189,15,153,41,19,145,78,216,2,174,254,107,175,80,86,170,
+		 47,30,181,42,200,238,34,71,37,120,107,33,221,20,63,206,240,16,129,
+		 247,150,29,156,65,187,94,68,146,93,46,198,30,184,205,105,200,143,
+		 63,59,62,208,79,162,206,217,3,129,132,0,2,129,128,15,83,40,172,56,
+		 47,61,243,17,97,65,195,61,167,214,122,247,246,1,50,211,33,113,16,
+		 20,213,195,62,77,235,25,162,140,175,158,8,61,65,10,255,204,162,71,
+		 130,122,86,161,163,253,236,178,139,183,57,181,202,160,25,133,130,
+		 155,150,104,168,187,107,186,144,164,225,173,101,182,68,49,210,30,
+		 34,47,83,65,79,250,156,248,47,232,44,67,36,22,126,43,216,100,247,
+		 100,250,240,121,72,29,185,2,109,144,54,204,235,54,15,242,57,171,
+		 125,39,236,247,71,111,221,51,196,126,77,238,36,87,163,107,48,105,
+		 48,29,6,3,85,29,14,4,22,4,20,179,51,215,81,162,4,13,68,251,157,64,
+		 241,18,98,113,176,83,246,105,13,48,31,6,3,85,29,35,4,24,48,22,128,
+		 20,116,21,213,36,28,189,94,101,136,31,225,139,9,126,127,234,25,72,
+		 78,97,48,23,6,3,85,29,32,4,16,48,14,48,12,6,10,96,134,72,1,101,3,
+		 2,1,48,1,48,14,6,3,85,29,15,1,1,255,4,4,3,2,6,192>>,
+
+    ?line SigBlob = <<48,45,2,21,0,140,167,200,210,153,212,64,155,249,33,146,104,243,
+		     39,38,9,115,162,89,24,2,20,76,254,31,128,187,48,128,215,216,
+		     112,198,78,118,160,217,157,180,246,64,234>>,
+    ?line P_p = 157224271412839155721795253728878055347359513988016145491388196653004661857517720927482198111104095793441029858267073789634147217022008635826863307553453131345099940951090826856271796188522037524757740796268675508118348391218066949174594918958269259937813776150149068811425194955973128428675945283593831134219,
+    ?line Q_p = 1181895316321540581845959276009400765315408342791,
+    ?line G_p = 143872196713149000950547166575757355261637863805587906227228163275557375159769599033632918292482002186641475268486598023281100659643528846513898847919251032731261718358900479488287933293278745715922865499005559197328388506945134386346185262919258658109015074718441639029135304654725637911172671711310801418648,
+    
+    ?line Key = 12603618348903387232593303690286336220738319446775939686476278478034365380027994899970214309288018488811754534229198764622077544117034174589418477472887827980332636062691833965078594576024299807057520016043084384987871640003684704483975314128362610573625803532737054022545217931847268776098203204571431581966,
+    
+    ValidKey = [crypto:mpint(P_p), 
+		crypto:mpint(Q_p), 
+		crypto:mpint(G_p),
+		crypto:mpint(Key)
+	       ],
+    
+    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(SigBlob),
+			      ValidKey), true),
+
+    BadMsg  = one_bit_wrong(Msg),
+    ?line m(my_dss_verify(sized_binary(BadMsg), sized_binary(SigBlob),
+			      ValidKey), false),
+    BadSig = one_bit_wrong(SigBlob),
+    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(BadSig),
+			      ValidKey), false),
+    SizeErr = size(SigBlob) - 13,
+    
+    BadArg = (catch my_dss_verify(sized_binary(Msg), <<SizeErr:32, SigBlob/binary>>,
+				      ValidKey)),
+    badarg = case element(1,element(2,BadArg)) of
+		 badarg -> badarg;
+		 function_clause -> badarg;
+		 X -> X
+	     end,
+    InValidKey = [crypto:mpint(P_p), 
+		  crypto:mpint(Q_p), 
+		  crypto:mpint(G_p),
+		  crypto:mpint(Key+17)
+		 ],
+    
+    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(SigBlob),
+			      InValidKey), false).
+
+
+one_bit_wrong(List) when is_list(List) ->
+    lists:map(fun(Bin) -> one_bit_wrong(Bin) end, List);
+one_bit_wrong(Bin) ->
+    Half = size(Bin) div 2,
+    <<First:Half/binary, Byte:8, Last/binary>> = Bin,
+    <<First/binary, (Byte+1):8, Last/binary>>.
+
+
+%%
+%%  Sign tests
+
+rsa_sign_test(doc) ->
+    "rsa_sign testing";
+rsa_sign_test(suite) ->
+    [];
+rsa_sign_test(Config) when is_list(Config) ->
+    PubEx  = 65537,
+    PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
+    Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
+    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
+	   "09812312908312378623487263487623412039812 huagasd">>,
+    
+    PrivKey = [PubEx, Mod, PrivEx],
+    PubKey  = [PubEx, Mod],
+    PubKeyMpint = map_int_to_mpint(PubKey),
+    Sig1 = crypto:rsa_sign(sized_binary(Msg), map_int_to_mpint(PrivKey)),
+    Sig1 = crypto:sign(rsa, sha, Msg, PrivKey),
+    true = crypto:rsa_verify(sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
+    true = crypto:verify(rsa, sha, Msg, Sig1, PubKey),
+    
+    Sig2 = crypto:rsa_sign(md5, sized_binary(Msg), map_int_to_mpint(PrivKey)),
+    Sig2 = crypto:sign(rsa, md5, Msg, PrivKey),
+    true = crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig2), PubKeyMpint),
+    true = crypto:verify(rsa, md5, Msg, Sig2, PubKey),
+    
+    false = (Sig1 =:= Sig2),
+    false = crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
+    false = crypto:verify(rsa, md5, Msg, Sig1, PubKey),
+    true = crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
+    true = crypto:verify(rsa, sha, Msg, Sig1, PubKey),
+
+    ok.
+map_int_to_mpint(List) ->
+    lists:map(fun(E) -> crypto:mpint(E) end, List).
+
+rsa_sign_hash_test(doc) ->
+    "rsa_sign_hash testing";
+rsa_sign_hash_test(suite) ->
+    [];
+rsa_sign_hash_test(Config) when is_list(Config) ->
+    PubEx  = 65537,
+    PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
+    Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
+    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
+	   "09812312908312378623487263487623412039812 huagasd">>,
+
+    PrivKey = [crypto:mpint(PubEx), crypto:mpint(Mod), crypto:mpint(PrivEx)],
+    PubKey  = [crypto:mpint(PubEx), crypto:mpint(Mod)],
+    MD5 = crypto:md5(sized_binary(Msg)),
+    SHA = crypto:sha(sized_binary(Msg)),
+    ?line Sig1 = crypto:rsa_sign(sha, {digest,SHA}, PrivKey),
+    ?line m(crypto:rsa_verify(sha, {digest,SHA}, sized_binary(Sig1),PubKey), true),
+
+    ?line Sig2 = crypto:rsa_sign(md5, {digest,MD5}, PrivKey),
+    ?line m(crypto:rsa_verify(md5, {digest,MD5}, sized_binary(Sig2),PubKey), true),
+
+    ?line m(Sig1 =:= Sig2, false),
+    ?line m(crypto:rsa_verify(md5, {digest,MD5}, sized_binary(Sig1),PubKey), false),
+    ?line m(crypto:rsa_verify(sha, {digest,SHA}, sized_binary(Sig2),PubKey), false),
+
+    ok.
+
+dsa_sign_test(doc) ->
+    "dsa_sign testing";
+dsa_sign_test(suite) ->
+    [];
+dsa_sign_test(Config) when is_list(Config) ->
+    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
+	   "09812312908312378623487263487623412039812 huagasd">>,
+
+    PubKey = _Y = 25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978,
+    PrivKey = _X = 441502407453038284293378221372000880210588566361,
+    ParamP = 109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797,
+    ParamQ = 1349199015905534965792122312016505075413456283393,
+    ParamG = 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669,
+
+    Params = [crypto:mpint(ParamP), crypto:mpint(ParamQ), crypto:mpint(ParamG)],
+    ?line Sig1 = my_dss_sign(sized_binary(Msg), Params ++ [crypto:mpint(PrivKey)]),
+    
+    ?line m(my_dss_verify(sized_binary(Msg), Sig1, 
+			      Params ++ [crypto:mpint(PubKey)]), true),
+    
+    ?line m(my_dss_verify(sized_binary(one_bit_wrong(Msg)), Sig1, 
+			      Params ++ [crypto:mpint(PubKey)]), false),
+    
+    ?line m(my_dss_verify(sized_binary(Msg), one_bit_wrong(Sig1), 
+			      Params ++ [crypto:mpint(PubKey)]), false),
+
+    %%?line Bad = crypto:dss_sign(sized_binary(Msg), [Params, crypto:mpint(PubKey)]),
+    
+    ok.
+
+dsa_sign_hash_test(doc) ->
+    "dsa_sign_hash testing";
+dsa_sign_hash_test(suite) ->
+    [];
+dsa_sign_hash_test(Config) when is_list(Config) ->
+    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
+	   "09812312908312378623487263487623412039812 huagasd">>,
+    SHA = crypto:sha(sized_binary(Msg)),
+
+    PubKey = _Y = 25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978,
+    PrivKey = _X = 441502407453038284293378221372000880210588566361,
+    ParamP = 109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797,
+    ParamQ = 1349199015905534965792122312016505075413456283393,
+    ParamG = 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669,
+
+    Params = [crypto:mpint(ParamP), crypto:mpint(ParamQ), crypto:mpint(ParamG)],
+    ?line Sig1 = crypto:dss_sign(sha, {digest,SHA}, Params ++ [crypto:mpint(PrivKey)]),
+
+    ?line m(crypto:dss_verify(none, SHA, sized_binary(Sig1),
+			      Params ++ [crypto:mpint(PubKey)]), true),
+
+    ?line m(crypto:dss_verify(sized_binary(one_bit_wrong(Msg)), sized_binary(Sig1),
+			      Params ++ [crypto:mpint(PubKey)]), false),
+
+    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(one_bit_wrong(Sig1)),
+			      Params ++ [crypto:mpint(PubKey)]), false),
+
+    %%?line Bad = crypto:dss_sign(sized_binary(Msg), [Params, crypto:mpint(PubKey)]),
+
+    ok.
+
+
+rsa_encrypt_decrypt(doc) ->
+    ["Test rsa_public_encrypt and rsa_private_decrypt functions."];
+rsa_encrypt_decrypt(suite) -> [];
+rsa_encrypt_decrypt(Config) when is_list(Config) ->
+    PubEx  = 65537,
+    PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
+    Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
+    
+    PrivKey = [PubEx, Mod, PrivEx],
+    PubKey  = [PubEx, Mod],
+
+    Msg = <<"7896345786348 Asldi">>,
+
+    ?line PKCS1 = rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_padding),
+    ?line PKCS1Dec = rsa_private_decrypt(PKCS1, PrivKey, rsa_pkcs1_padding),
+    io:format("PKCS1Dec ~p~n",[PKCS1Dec]),
+    ?line Msg = PKCS1Dec,
+    
+    ?line OAEP = rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_oaep_padding),
+    ?line Msg = rsa_private_decrypt(OAEP, PrivKey, rsa_pkcs1_oaep_padding),
+
+    <<Msg2Len:32,_/binary>> = crypto:mpint(Mod),
+    Msg2 = list_to_binary(lists:duplicate(Msg2Len-1, $X)),
+    ?line NoPad = rsa_public_encrypt(Msg2, PubKey, rsa_no_padding),
+    ?line NoPadDec = rsa_private_decrypt(NoPad, PrivKey, rsa_no_padding),
+    ?line NoPadDec = Msg2,
+    
+    ShouldBeError = (catch rsa_public_encrypt(Msg, PubKey, rsa_no_padding)),
+    ?line {'EXIT', {encrypt_failed,_}} = ShouldBeError,
+    
+%%     ?line SSL = rsa_public_encrypt(Msg, PubKey, rsa_sslv23_padding),
+%%     ?line Msg = rsa_private_decrypt(SSL, PrivKey, rsa_sslv23_padding),
+
+    ?line PKCS1_2 = rsa_private_encrypt(Msg, PrivKey, rsa_pkcs1_padding),
+    ?line PKCS1_2Dec = rsa_public_decrypt(PKCS1_2, PubKey, rsa_pkcs1_padding),
+    io:format("PKCS2Dec ~p~n",[PKCS1_2Dec]),
+    ?line Msg = PKCS1_2Dec,
+
+    ?line PKCS1_3 = rsa_private_encrypt(Msg2, PrivKey, rsa_no_padding),
+    ?line PKCS1_3Dec = rsa_public_decrypt(PKCS1_3, PubKey, rsa_no_padding),
+    io:format("PKCS2Dec ~p~n",[PKCS1_3Dec]),
+    ?line Msg2 = PKCS1_3Dec,
+    
+    ?line {'EXIT', {encrypt_failed,_}} = 
+	(catch rsa_private_encrypt(Msg, PrivKey, rsa_no_padding)),
+    
+    ok.
+
+rsa_public_encrypt(Msg, Key, Pad) ->
+    C1 = crypto:rsa_public_encrypt(Msg, Key, Pad),
+    C2 = crypto:rsa_public_encrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad),
+    {C1,C2}.
+
+rsa_public_decrypt(Msg, Key, Pad) ->
+    R = crypto:rsa_public_decrypt(Msg, Key, Pad),
+    R = crypto:rsa_public_decrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
+
+rsa_private_encrypt(Msg, Key, Pad) ->
+    R = crypto:rsa_private_encrypt(Msg, Key, Pad),
+    R = crypto:rsa_private_encrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
+
+rsa_private_decrypt({C1,C2}, Key, Pad) ->
+    R = crypto:rsa_private_decrypt(C1, Key, Pad),
+    R = crypto:rsa_private_decrypt(C2, Key, Pad),
+    R = crypto:rsa_private_decrypt(C1, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad),
+    R = crypto:rsa_private_decrypt(C2, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
+
+
+dh(doc) ->
+    ["Test dh (Diffie-Hellman) functions."];
+dh(suite) -> [];
+dh(Config) when is_list(Config) ->
+    Self = self(),
+    GenP = fun() ->
+		   %% Gen Param may take arbitrary long time to finish 
+		   %% That's not a bug in erlang crypto application.
+		   ?line DHPs = crypto:dh_generate_parameters(512,2),
+		   ?line ok = crypto:dh_check(DHPs),
+		   Self ! {param, DHPs}
+	   end,
+    Pid = spawn(GenP),
+    receive 
+	{param, DHPs} ->
+	    timer:sleep(100), 
+	    io:format("DHP ~p~n", [DHPs]),
+	    DHPs_mpint = lists:map(fun(E) -> sized_binary(E) end, DHPs),
+	    ?line {Pub1,Priv1} = crypto:generate_key(dh, DHPs),
+	    io:format("Key1:~n~p~n~p~n~n", [Pub1,Priv1]),
+	    ?line {Pub2,Priv2} = crypto:dh_generate_key(DHPs_mpint),
+	    io:format("Key2:~n~p~n~p~n~n", [Pub2,Priv2]),
+	    ?line A = crypto:compute_key(dh, Pub1, unsized_binary(Priv2), DHPs),
+	    ?line A = crypto:dh_compute_key(sized_binary(Pub1), Priv2, DHPs_mpint),
+	    timer:sleep(100),  %% Get another thread see if that triggers problem
+	    ?line B = crypto:compute_key(dh, unsized_binary(Pub2), Priv1, DHPs),
+	    ?line B = crypto:dh_compute_key(Pub2, sized_binary(Priv1), DHPs_mpint),
+	    io:format("A ~p~n",[A]),
+	    io:format("B ~p~n",[B]),
+	    ?line A = B
+    after 50000 ->
+	    io:format("Killing Param generation which took to long ~p~n",[Pid]),
+	    exit(Pid, kill)
+    end.
+
+
+ec(doc) ->
+    ["Test ec (Ecliptic Curve) functions."];
+ec(suite) -> [];
+ec(Config) when is_list(Config) ->
+    if_supported(ecdh, fun() -> ec_do() end).
+
+ec_do() ->
+    %% test for a name curve
+    {D2_pub, D2_priv} = crypto:generate_key(ecdh, sect113r2),
+    PrivECDH = [D2_priv, sect113r2],
+    PubECDH = [D2_pub, sect113r2],
+    %%TODO: find a published test case for a EC key
+
+    %% test for a full specified curve and public key,
+    %% taken from csca-germany_013_self_signed_cer.pem
+    PubKey = <<16#04, 16#4a, 16#94, 16#49, 16#81, 16#77, 16#9d, 16#df,
+	       16#1d, 16#a5, 16#e7, 16#c5, 16#27, 16#e2, 16#7d, 16#24,
+	       16#71, 16#a9, 16#28, 16#eb, 16#4d, 16#7b, 16#67, 16#75,
+	       16#ae, 16#09, 16#0a, 16#51, 16#45, 16#19, 16#9b, 16#d4,
+	       16#7e, 16#a0, 16#81, 16#e5, 16#5e, 16#d4, 16#a4, 16#3f,
+	       16#60, 16#7c, 16#6a, 16#50, 16#ee, 16#36, 16#41, 16#8a,
+	       16#87, 16#ff, 16#cd, 16#a6, 16#10, 16#39, 16#ca, 16#95,
+	       16#76, 16#7d, 16#ae, 16#ca, 16#c3, 16#44, 16#3f, 16#e3, 16#2c>>,
+    <<P:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
+                          16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
+			  16#72, 16#6e, 16#3b, 16#f6, 16#23, 16#d5, 16#26, 16#20,
+			  16#28, 16#20, 16#13, 16#48, 16#1d, 16#1f, 16#6e, 16#53, 16#77>>,
+    <<A:256/integer>> = <<16#7d, 16#5a, 16#09, 16#75, 16#fc, 16#2c, 16#30, 16#57,
+			  16#ee, 16#f6, 16#75, 16#30, 16#41, 16#7a, 16#ff, 16#e7,
+			  16#fb, 16#80, 16#55, 16#c1, 16#26, 16#dc, 16#5c, 16#6c,
+			  16#e9, 16#4a, 16#4b, 16#44, 16#f3, 16#30, 16#b5, 16#d9>>,
+    <<B:256/integer>> = <<16#26, 16#dc, 16#5c, 16#6c, 16#e9, 16#4a, 16#4b, 16#44,
+			  16#f3, 16#30, 16#b5, 16#d9, 16#bb, 16#d7, 16#7c, 16#bf,
+			  16#95, 16#84, 16#16, 16#29, 16#5c, 16#f7, 16#e1, 16#ce,
+			  16#6b, 16#cc, 16#dc, 16#18, 16#ff, 16#8c, 16#07, 16#b6>>,
+    BasePoint = <<16#04, 16#8b, 16#d2, 16#ae, 16#b9, 16#cb, 16#7e, 16#57,
+		  16#cb, 16#2c, 16#4b, 16#48, 16#2f, 16#fc, 16#81, 16#b7,
+		  16#af, 16#b9, 16#de, 16#27, 16#e1, 16#e3, 16#bd, 16#23,
+		  16#c2, 16#3a, 16#44, 16#53, 16#bd, 16#9a, 16#ce, 16#32,
+		  16#62, 16#54, 16#7e, 16#f8, 16#35, 16#c3, 16#da, 16#c4,
+		  16#fd, 16#97, 16#f8, 16#46, 16#1a, 16#14, 16#61, 16#1d,
+		  16#c9, 16#c2, 16#77, 16#45, 16#13, 16#2d, 16#ed, 16#8e,
+		  16#54, 16#5c, 16#1d, 16#54, 16#c7, 16#2f, 16#04, 16#69, 16#97>>,
+    <<Order:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
+			      16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
+			      16#71, 16#8c, 16#39, 16#7a, 16#a3, 16#b5, 16#61, 16#a6,
+			      16#f7, 16#90, 16#1e, 16#0e, 16#82, 16#97, 16#48, 16#56, 16#a7>>,
+    CoFactor = 1,
+    Curve = {{prime_field,P},{A,B,none},BasePoint, Order,CoFactor},
+
+    Msg = <<99,234,6,64,190,237,201,99,80,248,58,40,70,45,149,218,5,246,242,63>>,
+    Sign = crypto:sign(ecdsa, sha, Msg, PrivECDH),
+    ?line true = crypto:verify(ecdsa, sha, Msg, Sign, PubECDH),
+    ?line false = crypto:verify(ecdsa, sha, Msg, <<10,20>>, PubECDH),
+
+    ok.
+
+srp3(doc) ->
+    ["SRP-3 test vectors generated by http://srp.stanford.edu/demo/demo.html"];
+srp3(suite) -> [];
+srp3(Config) when is_list(Config) ->
+    Username = <<"alice">>,
+    Password = <<"password123">>,
+    Salt = hexstr2bin("2857827A19266A1F2BC6"),
+    Prime = hexstr2bin("EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C"
+		       "9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE4"
+		       "8E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B29"
+		       "7BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9A"
+		       "FD5138FE8376435B9FC61D2FC0EB06E3"),
+    Generator = <<2>>,
+    Version = '3',
+    Scrambler = hexstr2bin("02E2476A"),
+
+    %% X = hexstr2bin("96E54AB0CD4C5123EDCFA4A1502918AAD3C9E2A8"),
+    Verifier = hexstr2bin("96EB5F13621D911AA1CA405DE9C64217D4108EEEECAFFE500034FE0E"
+			  "C031E42C8714667C161BCE0E7996F7DDE1B63824C130D2D7286C08C0"
+			  "49758420735961347112AE102A3F23B3F687F8FEE0DF2BFAF933C608"
+			  "D6FE5B5EEE3116FE54016E065BF8E8C9FDBBC08719231AC215149140"
+			  "519E8FDD9AA4F410C28A58AF42974D2D"),
+    ClientPrivate = hexstr2bin("6411DE75538BED8170677D577D0608F39112BC95B503C447EB6AC945"
+			  "49C75C7B"),
+    ServerPrivate = hexstr2bin("85E44A6F694DBE676145DB245A045CD37C99F05C562C7840A31F270D"
+			  "9AADCF8B"),
+    ClientPublic = hexstr2bin("B22B1FFA2244B8CB94F3A9080F419CAEAB0DBA93EA1965B5E84587EE"
+			 "55C79E7A118865DC59B9D0353362C2A8261E7C1B0D221A0E233C2AD1"
+			 "640DACBB8664CBC9733EAC392DA7800142860380C3FC573C3C064329"
+			 "CF54063FD114C7210E9CB3A611EA8002B1844B698F930D95D143899B"
+			 "948A090E0C25938E5F84067D1883DC63"),
+    ServerPublic = hexstr2bin("93A8C4D8B7F7395ADCFD4ABA37B015124513D3F37B3E85EB23064BE5"
+			 "F53C0AE32FFB9D8C0AA0DCFFA74D632DD67DEBB5C35AAE9812286CC8"
+			 "C43CC176ECBC6D3F447594D9554E995B2509127BF88FADDDA4982D03"
+			 "8EC3001320712D3B1269308CE70F319B2295FA57674F03A2D993CFB1"
+			 "F84C35B7D0C012FA73CD4C8F7D5A71C7"),
+
+    SessionKey = hexstr2bin("C29A986C4D521BBC66428ED11D994CD7431574A6184B83CDCC345092"
+			    "791E75748A1D38CAC4BD14760F0D2694B711236419240FF2F172454C"
+			    "46ABF4FF39498DAFDD2C82924F7D7BD76CDFCE688C77D93F18A65409"
+			    "9176A9192615DC0277AE7C12F1F6A7F6563FCA11675D809AF578BDE5"
+			    "2B51E05D440B63099A017A0B45044801"),
+    UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
+    Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
+    ClientPublic = crypto:mod_pow(Generator, ClientPrivate, Prime),
+
+    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
+    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
+    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
+				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
+    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
+				    {host, [Verifier, Prime, Version, Scrambler]}).
+
+srp6(doc) ->
+    ["SRP-6 test vectors generated by http://srp.stanford.edu/demo/demo.html"];
+srp6(suite) -> [];
+srp6(Config) when is_list(Config) ->
+    Username = <<"alice">>,
+    Password = <<"password123">>,
+    Salt = hexstr2bin("2857827A19266A1F2BC6"),
+    Prime = hexstr2bin("EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C"
+		       "9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE4"
+		       "8E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B29"
+		       "7BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9A"
+		       "FD5138FE8376435B9FC61D2FC0EB06E3"),
+    Generator = <<2>>,
+    Version = '6',
+    Scrambler = hexstr2bin("0A2534C0BF52A0DA9001EEC62CF2A546AB0908A7"),
+    Verifier = hexstr2bin("96EB5F13621D911AA1CA405DE9C64217D4108EEEECAFFE500034FE0E"
+			  "C031E42C8714667C161BCE0E7996F7DDE1B63824C130D2D7286C08C0"
+			  "49758420735961347112AE102A3F23B3F687F8FEE0DF2BFAF933C608"
+			  "D6FE5B5EEE3116FE54016E065BF8E8C9FDBBC08719231AC215149140"
+			  "519E8FDD9AA4F410C28A58AF42974D2D"),
+    ClientPrivate = hexstr2bin("6411DE75538BED8170677D577D0608F39112BC95B503C447EB6AC945"
+			  "49C75C7B"),
+    ServerPrivate = hexstr2bin("85E44A6F694DBE676145DB245A045CD37C99F05C562C7840A31F270D"
+			  "9AADCF8B"),
+    ClientPublic = hexstr2bin("B22B1FFA2244B8CB94F3A9080F419CAEAB0DBA93EA1965B5E84587EE"
+			 "55C79E7A118865DC59B9D0353362C2A8261E7C1B0D221A0E233C2AD1"
+			 "640DACBB8664CBC9733EAC392DA7800142860380C3FC573C3C064329"
+			 "CF54063FD114C7210E9CB3A611EA8002B1844B698F930D95D143899B"
+			 "948A090E0C25938E5F84067D1883DC63"),
+    ServerPublic = hexstr2bin("D2D07845CE7ECDB9845DD36B10ACD3598CC29049DE9F467F84CE16B6"
+			 "D97A6DC567AF8B0F9FEDF74962400AD5C357951E64E67B641246F264"
+			 "C8DE6D9A72E554D6C8D3194548780A0C438A0FCC509CA88A14AA1DEB"
+			 "C0F09E4B37A965D1545DB4AD361346F3189B0EA569C06D326C4E4797"
+			 "9E381C748293B7C0591BE0BE419E053E"),
+
+    SessionKey = hexstr2bin("19D22C19612874EBF1F2581F8EFCFDC44C6FDA3B87B0A73823D7E962"
+				 "554295D4E48D3A336523ADBDDD0EC8FB0F02687109E97E01C17C93CC"
+				 "7216F9CD8A4AC39F0429857D8D1023066614BDFCBCB89F59A0FEB81C"
+				 "72E992AAD89095A84B6A5FADA152369AB1E350A03693BEF044DF3EDF"
+				 "0C34741F4696C30E9F675D09F58ACBEB"),
+    UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
+    Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
+    ClientPublic = crypto:mod_pow(Generator, ClientPrivate, Prime),
+
+    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
+    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
+    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
+				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
+    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
+				    {host, [Verifier, Prime, Version, Scrambler]}).
+
+srp6a(doc) ->
+    ["SRP-6a test vectors from RFC5054."];
+srp6a(suite) -> [];
+srp6a(Config) when is_list(Config) ->
+    Username = <<"alice">>,
+    Password = <<"password123">>,
+    Salt = hexstr2bin("BEB25379D1A8581EB5A727673A2441EE"),
+    Prime = hexstr2bin("EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C"
+		       "9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE4"
+		       "8E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B29"
+		       "7BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9A"
+		       "FD5138FE8376435B9FC61D2FC0EB06E3"),
+    Generator = <<2>>,
+    Version = '6a',
+    Scrambler = hexstr2bin("CE38B9593487DA98554ED47D70A7AE5F462EF019"),
+    Verifier = hexstr2bin("7E273DE8696FFC4F4E337D05B4B375BEB0DDE1569E8FA00A9886D812"
+			  "9BADA1F1822223CA1A605B530E379BA4729FDC59F105B4787E5186F5"
+			  "C671085A1447B52A48CF1970B4FB6F8400BBF4CEBFBB168152E08AB5"
+			  "EA53D15C1AFF87B2B9DA6E04E058AD51CC72BFC9033B564E26480D78"
+			  "E955A5E29E7AB245DB2BE315E2099AFB"),
+    ClientPrivate = hexstr2bin("60975527035CF2AD1989806F0407210BC81EDC04E2762A56AFD529DD"
+			  "DA2D4393"),
+    ServerPrivate = hexstr2bin("E487CB59D31AC550471E81F00F6928E01DDA08E974A004F49E61F5D1"
+			  "05284D20"),
+    ClientPublic = hexstr2bin("61D5E490F6F1B79547B0704C436F523DD0E560F0C64115BB72557EC4"
+			 "4352E8903211C04692272D8B2D1A5358A2CF1B6E0BFCF99F921530EC"
+			 "8E39356179EAE45E42BA92AEACED825171E1E8B9AF6D9C03E1327F44"
+			 "BE087EF06530E69F66615261EEF54073CA11CF5858F0EDFDFE15EFEA"
+			 "B349EF5D76988A3672FAC47B0769447B"),
+    ServerPublic = hexstr2bin("BD0C61512C692C0CB6D041FA01BB152D4916A1E77AF46AE105393011"
+			 "BAF38964DC46A0670DD125B95A981652236F99D9B681CBF87837EC99"
+			 "6C6DA04453728610D0C6DDB58B318885D7D82C7F8DEB75CE7BD4FBAA"
+			 "37089E6F9C6059F388838E7A00030B331EB76840910440B1B27AAEAE"
+			 "EB4012B7D7665238A8E3FB004B117B58"),
+ 
+    SessionKey = hexstr2bin("B0DC82BABCF30674AE450C0287745E7990A3381F63B387AAF271A10D"
+			    "233861E359B48220F7C4693C9AE12B0A6F67809F0876E2D013800D6C"
+			    "41BB59B6D5979B5C00A172B4A2A5903A0BDCAF8A709585EB2AFAFA8F"
+			    "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
+			    "C346D7E474B29EDE8A469FFECA686E5A"),
+    UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
+    Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
+
+    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
+    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
+
+    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
+				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
+    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
+				    {host, [Verifier, Prime, Version, Scrambler]}).
+    
+%%
+%%
+exor_test(doc) ->
+    ["Test the exor function."];
+exor_test(suite) ->
+    [];
+exor_test(Config) when is_list(Config) ->
+    B = <<1, 2, 3, 4, 5, 6, 7, 8, 9, 10>>,
+    Z1 = zero_bin(B),
+    Z1 = crypto:exor(B, B),
+    B1 = crypto:rand_bytes(100),
+    B2 = crypto:rand_bytes(100),
+    Z2 = zero_bin(B1),
+    Z2 = crypto:exor(B1, B1),
+    Z2 = crypto:exor(B2, B2),
+    R = xor_bytes(B1, B2),
+    R = crypto:exor(B1, B2),
+    ok.
+
+%%
+%%
+rc4_test(doc) ->
+    ["Test rc4 encryption ."];
+rc4_test(suite) ->
+    [];
+rc4_test(Config) when is_list(Config) ->
+    CT1 = <<"Yo baby yo">>,
+    R1 = <<118,122,68,110,157,166,141,212,139,39>>,
+    K = "apaapa",
+    R1 = crypto:rc4_encrypt(K, CT1),
+    CT1 = crypto:rc4_encrypt(K, R1),
+    CT2 = lists:seq(0, 255),
+    R2 = crypto:rc4_encrypt(K, CT2),
+    CT2 = binary_to_list(crypto:rc4_encrypt(K, R2)),
+    ok.
+
+rc4_stream_test(doc) ->
+    ["Test rc4 stream encryption ."];
+rc4_stream_test(suite) ->
+    [];
+rc4_stream_test(Config) when is_list(Config) ->
+    CT1 = <<"Yo ">>,
+    CT2 = <<"baby yo">>,
+    K = "apaapa",
+    State0 = crypto:rc4_set_key(K),
+    {State1, R1} = crypto:rc4_encrypt_with_state(State0, CT1),
+    {_State2, R2} = crypto:rc4_encrypt_with_state(State1, CT2),
+    R = list_to_binary([R1, R2]),
+    <<118,122,68,110,157,166,141,212,139,39>> = R,
+    ok.
+
+blowfish_cfb64(doc) -> ["Test Blowfish encrypt/decrypt."];
+blowfish_cfb64(suite) -> [];
+blowfish_cfb64(Config) when is_list(Config) ->   			
+    Key = <<1,35,69,103,137,171,205,239,240,225,210,195,180,165,150,135>>,
+
+    IVec = <<254,220,186,152,118,84,50,16>>,
+    Plain = <<"7654321 Now is the time for ">>,
+    Enc = <<231,50,20,162,130,33,57,202,242,110,207,109,46,185,231,110,61,163,222,4,209,81,114,0,81,157,87,166>>,
+
+    Enc = crypto:blowfish_cfb64_encrypt(Key, IVec, Plain),
+    Plain = crypto:blowfish_cfb64_decrypt(Key, IVec, Enc),
+
+    Key2 = <<"A2B4C">>,
+    IVec2 = <<"12345678">>,
+    Plain2 = <<"badger at my table....!">>,
+    Enc2 = <<173,76,128,155,70,81,79,228,4,162,188,92,119,53,144,89,93,236,28,164,176,16,138>>,
+
+    Enc2 = crypto:blowfish_cfb64_encrypt(Key2, IVec2, Plain2),
+    Plain2 = crypto:blowfish_cfb64_decrypt(Key2, IVec2, Enc2).
+
+
+smp(doc) -> "Check concurrent access to crypto driver";
+smp(suite) -> [];
+smp(Config) ->
+    case erlang:system_info(smp_support) of
+	true ->
+	    NumOfProcs = erlang:system_info(schedulers),
+	    io:format("smp starting ~p workers\n",[NumOfProcs]),
+	    Seeds = [random:uniform(9999) || _ <- lists:seq(1,NumOfProcs)],
+	    Parent = self(),
+	    Pids = [spawn_link(fun()-> worker(Seed,Config,Parent) end)
+		    || Seed <- Seeds],
+	    wait_pids(Pids);
+
+	false ->
+	    {skipped,"No smp support"}
+    end.
+	    
+worker(Seed, Config, Parent) ->
+    io:format("smp worker ~p, seed=~p~n",[self(),Seed]),
+    random:seed(Seed,Seed,Seed),
+    worker_loop(100, Config),
+    %%io:format("worker ~p done\n",[self()]),
+    Parent ! self().
+
+worker_loop(0, _) ->
+    ok;
+worker_loop(N, Config) ->
+    Funcs = { md5, md5_update, md5_mac, md5_mac_io, sha, sha_update, des_cbc,
+	      aes_cfb, aes_cbc, des_cbc_iter, rand_uniform_test, strong_rand_test,
+	      rsa_verify_test, exor_test, rc4_test, rc4_stream_test, mod_exp_test,
+              hmac_update_md5, hmac_update_sha, hmac_update_sha256, hmac_update_sha512,
+	      hmac_rfc2202, hmac_rfc4231_sha224, hmac_rfc4231_sha256, hmac_rfc4231_sha384,
+	      hmac_rfc4231_sha512, aes_ctr_stream },
+
+    F = element(random:uniform(size(Funcs)),Funcs),
+    %%io:format("worker ~p calling ~p\n",[self(),F]),
+    ?MODULE:F(Config),
+    worker_loop(N-1,Config).
+    
+wait_pids([]) -> 
+    ok;
+wait_pids(Pids) ->
+    receive
+	Pid ->
+	    ?line true = lists:member(Pid,Pids),
+	    Others = lists:delete(Pid,Pids),
+	    io:format("wait_pid got ~p, still waiting for ~p\n",[Pid,Others]),
+	    wait_pids(Others)
+    end.
+
+%%
+%% Help functions
+%%
+
+% match
+m(X, X) ->
+    ?line true.
+t(true) ->
+    true.
+
+% hexstr2bin
+hexstr2bin(S) ->
+    list_to_binary(hexstr2list(S)).
+
+hexstr2list([X,Y|T]) ->
+    [mkint(X)*16 + mkint(Y) | hexstr2list(T)];
+hexstr2list([]) ->
+    [].
+
+mkint(C) when $0 =< C, C =< $9 ->
+    C - $0;
+mkint(C) when $A =< C, C =< $F ->
+    C - $A + 10;
+mkint(C) when $a =< C, C =< $f ->
+    C - $a + 10.
+
+%% mod_exp in erlang (copied from jungerl's ssh_math.erl)
+ipow(A, B, M) when M > 0, B >= 0 ->
+    if A == 1 -> 
+ 	    1;
+       true -> 
+ 	    ipow(A, B, M, 1)
+    end.
+
+ipow(A, 1, M, Prod) ->
+    (A*Prod) rem M;
+ipow(_A, 0, _M, Prod) ->
+    Prod;
+ipow(A, B, M, Prod)  ->
+    B1 = B bsr 1,
+    A1 = (A*A) rem M,
+    if B - B1 == B1 ->
+	    ipow(A1, B1, M, Prod);
+       true ->
+	    ipow(A1, B1, M, (A*Prod) rem M)
+    end.
+
+%%
+%% Invert an element X mod P
+%% Calculated as {1, {A,B}} = egcd(X,P),
+%%   1 == P*A + X*B == X*B (mod P) i.e B is the inverse element
+%%
+%% X > 0, P > 0, X < P   (P should be prime)
+%%
+%% invert(X,P) when X > 0, P > 0, X < P ->
+%%     I = inv(X,P,1,0),
+%%     if 
+%%         I < 0 -> P + I;
+%%         true -> I
+%%     end.
+
+%% inv(0,_,_,Q) -> Q;
+%% inv(X,P,R1,Q1) ->
+%%     D = P div X,
+%%     inv(P rem X, X, Q1 - D*R1, R1).    
+
+sized_binary(Binary) when is_binary(Binary) ->
+    <<(size(Binary)):32/integer, Binary/binary>>;
+sized_binary(List) ->
+    sized_binary(list_to_binary(List)).
+
+unsized_binary(<<Sz:32/integer, Binary:Sz/binary>>) ->
+    Binary.
+
+xor_bytes(Bin1, Bin2) when is_binary(Bin1), is_binary(Bin2) ->
+    L1 = binary_to_list(Bin1),
+    L2 = binary_to_list(Bin2),
+    list_to_binary(xor_bytes(L1, L2));
+xor_bytes(L1, L2) ->
+    xor_bytes(L1, L2, []).
+
+xor_bytes([], [], Acc) ->
+    lists:reverse(Acc);
+xor_bytes([N1 | Tl1], [N2 | Tl2], Acc) ->
+    xor_bytes(Tl1, Tl2, [N1 bxor N2 | Acc]).
+
+zero_bin(N) when is_integer(N) ->
+    N8 = N * 8,
+    <<0:N8/integer>>;
+zero_bin(B) when is_binary(B) ->
+    zero_bin(size(B)).
+
+my_dss_verify(Data,[Sign|Tail],Key) ->
+    Res = my_dss_verify(Data,sized_binary(Sign),Key),
+    case Tail of
+        [] ->  Res;
+        _ -> ?line Res = my_dss_verify(Data,Tail,Key)
+    end;       
+my_dss_verify(Data,Sign,Key) ->
+    ?line Res = crypto:dss_verify(Data, Sign, Key),
+    ?line Res = crypto:dss_verify(sha, Data, Sign, Key),
+    ?line <<_:32,Raw/binary>> = Data,
+    ?line Res = crypto:dss_verify(none, crypto:sha(Raw), Sign, Key),
+    Res.
+
+my_dss_sign(Data,Key) ->
+    ?line S1 = crypto:dss_sign(Data, Key),
+    ?line S2 = crypto:dss_sign(sha, Data, Key),
+    ?line <<_:32,Raw/binary>> = Data,
+    ?line S3 = crypto:dss_sign(none, crypto:sha(Raw), Key),
+    [S1,S2,S3].
+
+openssl_version() ->
+    case crypto:info_lib() of
+	[{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer) ->
+	    LibVer;
+	_ ->
+	    undefined
+    end.
+
+if_supported(Algorithm, Fun) ->
+    case lists:member(Algorithm, lists:append([Algo ||  {_, Algo}  <- crypto:supports()])) of
+	true ->
+	    Fun();
+	_ ->
+	    {skipped, io:format("~s not spupported", [Algorithm])}
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl b/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
index 5503f39412..e6256e5a53 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
@@ -69,8 +69,8 @@ test(TargetId, [Date | DateTail], Key, IVT, IVF) ->
 	{ok, message_from_server(), binary(), binary()}.
 culprit(Message, Key, IVecToServer, IVecFromServer) ->
     {Packet, NewIVecToServer} = message_to_packet(Message, Key, IVecToServer),
-    Message = crypto:aes_cbc_128_decrypt(Key, IVecFromServer, Packet),
-    NewIVecFromServer = crypto:aes_cbc_ivec(Packet),
+    Message = crypto:block_decrypt(aes_cbc128, Key, IVecFromServer, Packet),
+    NewIVecFromServer = crypto:next_iv(aes_cbc, Packet),
     ParsedMessage = parse_message(Message),
     {ok, ParsedMessage, NewIVecToServer, NewIVecFromServer}.
 
@@ -185,9 +185,9 @@ parse_audio_output_info(<<Output:?DWORD, BitMap:?BITMAP1, Rest/binary>>) ->
 -spec message_to_packet(binary(), binary(), binary()) -> {binary(), binary()}.
 message_to_packet(Message, Key, IVec) ->
     PaddedMessage = pad_pkcs5(Message),
-    Packet = crypto:aes_cbc_128_encrypt(Key, IVec, PaddedMessage),
+    Packet = crypto:block_encrypt(aes_cbc128, Key, IVec, PaddedMessage),
     TotalSize = byte_size(Packet),
-    NewIVec = crypto:aes_cbc_ivec(Packet),
+    NewIVec = crypto:next_iv(aes_cbc, Packet),
     {<<TotalSize:?WORD, Packet/binary>>, NewIVec}.
 
 -spec pad_pkcs5(binary()) -> binary().
diff --git a/lib/inets/test/erl_make_certs.erl b/lib/inets/test/erl_make_certs.erl
index 5b92e551a5..22dc951ac1 100644
--- a/lib/inets/test/erl_make_certs.erl
+++ b/lib/inets/test/erl_make_certs.erl
@@ -45,7 +45,7 @@
 %%      {dnQualifer, DnQ}
 %%   issuer = {Issuer, IssuerKey}                   true (i.e. a ca cert is created) 
 %%                                                  (obs IssuerKey migth be {Key, Password}
-%%   key = KeyFile|KeyBin|rsa|dsa                   Subject PublicKey rsa or dsa generates key
+%%   key = KeyFile|KeyBin|rsa|dsa|ec                Subject PublicKey rsa, dsa or ec generates key
 %%   
 %%
 %%   (OBS: The generated keys are for testing only)
@@ -91,6 +91,16 @@ gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
     {Key, encode_key(Key)}.
 
 %%--------------------------------------------------------------------
+%% @doc Creates a ec key (OBS: for testing only)
+%%   the sizes are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_ec(Curve) when is_atom(Curve) ->
+    Key = gen_ec2(Curve),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
 %% @doc Verifies cert signatures
 %% @spec (::binary(), ::tuple()) -> ::boolean()
 %% @end
@@ -102,7 +112,10 @@ verify_signature(DerEncodedCert, DerKey, _KeyParams) ->
 	    public_key:pkix_verify(DerEncodedCert, 
 				   #'RSAPublicKey'{modulus=Mod, publicExponent=Exp});
 	#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y} ->
-	    public_key:pkix_verify(DerEncodedCert, {Y, #'Dss-Parms'{p=P, q=Q, g=G}})
+	    public_key:pkix_verify(DerEncodedCert, {Y, #'Dss-Parms'{p=P, q=Q, g=G}});
+	#'ECPrivateKey'{version = _Version, privateKey = _PrivKey,
+			parameters = Params, publicKey = {0, PubKey}} ->
+	    public_key:pkix_verify(DerEncodedCert, {#'ECPoint'{point = PubKey}, Params})
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%% Implementation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -112,6 +125,7 @@ get_key(Opts) ->
 	undefined -> make_key(rsa, Opts);
 	rsa ->       make_key(rsa, Opts);
 	dsa ->       make_key(dsa, Opts);
+	ec ->        make_key(ec, Opts);
 	Key ->
 	    Password = proplists:get_value(password, Opts, no_passwd),
 	    decode_key(Key, Password)
@@ -129,6 +143,8 @@ decode_key(#'RSAPrivateKey'{} = Key,_) ->
     Key;
 decode_key(#'DSAPrivateKey'{} = Key,_) ->
     Key;
+decode_key(#'ECPrivateKey'{} = Key,_) ->
+    Key;
 decode_key(PemEntry = {_,_,_}, Pw) ->
     public_key:pem_entry_decode(PemEntry, Pw);
 decode_key(PemBin, Pw) ->
@@ -140,7 +156,10 @@ encode_key(Key = #'RSAPrivateKey'{}) ->
     {'RSAPrivateKey', Der, not_encrypted};
 encode_key(Key = #'DSAPrivateKey'{}) ->
     {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
-    {'DSAPrivateKey', Der, not_encrypted}.
+    {'DSAPrivateKey', Der, not_encrypted};
+encode_key(Key = #'ECPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('ECPrivateKey', Key),
+    {'ECPrivateKey', Der, not_encrypted}.
 
 make_tbs(SubjectKey, Opts) ->    
     Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),
@@ -277,7 +296,14 @@ publickey(#'RSAPrivateKey'{modulus=N, publicExponent=E}) ->
 publickey(#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y}) ->
     Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-dsa', 
 				 parameters={params, #'Dss-Parms'{p=P, q=Q, g=G}}},
-    #'OTPSubjectPublicKeyInfo'{algorithm = Algo, subjectPublicKey = Y}.
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo, subjectPublicKey = Y};
+publickey(#'ECPrivateKey'{version = _Version,
+			  privateKey = _PrivKey,
+			  parameters = Params,
+			  publicKey = {0, PubKey}}) ->
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-ecPublicKey', parameters=Params},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo,
+			       subjectPublicKey = #'ECPoint'{point = PubKey}}.
 
 validity(Opts) ->
     DefFrom0 = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())-1),
@@ -298,13 +324,24 @@ sign_algorithm(#'RSAPrivateKey'{}, Opts) ->
 	   end,
     {Type, 'NULL'};
 sign_algorithm(#'DSAPrivateKey'{p=P, q=Q, g=G}, _Opts) ->
-    {?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}}.
+    {?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}};
+sign_algorithm(#'ECPrivateKey'{}, Opts) ->
+    Type = case proplists:get_value(digest, Opts, sha1) of
+	       sha1 ->   ?'ecdsa-with-SHA1';
+	       sha512 -> ?'ecdsa-with-SHA512';
+	       sha384 -> ?'ecdsa-with-SHA384';
+	       sha256 -> ?'ecdsa-with-SHA256'
+	   end,
+    {Type, 'NULL'}.
 
 make_key(rsa, _Opts) ->
     %% (OBS: for testing only)
     gen_rsa2(64);
 make_key(dsa, _Opts) ->
-    gen_dsa2(128, 20).  %% Bytes i.e. {1024, 160} 
+    gen_dsa2(128, 20);  %% Bytes i.e. {1024, 160}
+make_key(ec, _Opts) ->
+    %% (OBS: for testing only)
+    gen_ec2(secp256k1).
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% RSA key generation  (OBS: for testing only)
@@ -349,24 +386,37 @@ gen_dsa2(LSize, NSize) ->
     X0 = prime(LSize),
     P0 = prime((LSize div 2) +1),
     
-    %% Choose L-bit prime modulus P such that p–1 is a multiple of q.
+    %% Choose L-bit prime modulus P such that p-1 is a multiple of q.
     case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
 	error -> 
 	    gen_dsa2(LSize, NSize);
 	P ->	    
-	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
-	    %%                 such that This may be done by setting g = h^(p–1)/q mod p, commonly h=2 is used.
+	    G = crypto:mod_pow(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
 	    
 	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
-	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
+	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
 	    
-	    #'DSAPrivateKey'{version=0, p=P, q=Q, g=G, y=Y, x=X}
+	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
+			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
     end.
     
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% EC key generation  (OBS: for testing only)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+gen_ec2(CurveId) ->
+     {PubKey, PrivKey} = crypto:generate_key(ecdh, CurveId),
+
+    #'ECPrivateKey'{version = 1,
+		    privateKey = binary_to_list(PrivKey),
+		    parameters = {namedCurve, pubkey_cert_records:namedCurves(CurveId)},
+		    publicKey = {0, PubKey}}.
+
 %% See fips_186-3.pdf
 dsa_search(T, P0, Q, Iter) when Iter > 0 ->
     P = 2*T*Q*P0 + 1,
-    case is_prime(crypto:mpint(P), 50) of
+    case is_prime(P, 50) of
 	true -> P;
 	false -> dsa_search(T+1, P0, Q, Iter-1)
     end;
@@ -377,38 +427,40 @@ dsa_search(_,_,_,_) ->
 %%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 prime(ByteSize) ->
     Rand = odd_rand(ByteSize),
-    crypto:erlint(prime_odd(Rand, 0)).
+    prime_odd(Rand, 0).
 
 prime_odd(Rand, N) ->
     case is_prime(Rand, 50) of
 	true -> 
 	    Rand;
 	false -> 
-	    NotPrime = crypto:erlint(Rand),
-	    prime_odd(crypto:mpint(NotPrime+2), N+1)
+	    prime_odd(Rand+2, N+1)
     end.
 
 %% see http://en.wikipedia.org/wiki/Fermat_primality_test
 is_prime(_, 0) -> true;
 is_prime(Candidate, Test) -> 
-    CoPrime = odd_rand(<<0,0,0,4, 10000:32>>, Candidate),
-    case crypto:mod_exp(CoPrime, Candidate, Candidate) of
-	CoPrime -> is_prime(Candidate, Test-1);
-	_       -> false
-    end.
+    CoPrime = odd_rand(10000, Candidate),
+    Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
+    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
+
+is_prime(CoPrime, CoPrime, Candidate, Test) ->
+    is_prime(Candidate, Test-1);
+is_prime(_,_,_,_) ->
+    false.
 
 odd_rand(Size) ->
     Min = 1 bsl (Size*8-1),
     Max = (1 bsl (Size*8))-1,
-    odd_rand(crypto:mpint(Min), crypto:mpint(Max)).
+    odd_rand(Min, Max).
 
 odd_rand(Min,Max) ->
-    Rand = <<Sz:32, _/binary>> = crypto:rand_uniform(Min,Max),
-    BitSkip = (Sz+4)*8-1,
-    case Rand of
-	Odd  = <<_:BitSkip,  1:1>> -> Odd;
-	Even = <<_:BitSkip,  0:1>> -> 
-	    crypto:mpint(crypto:erlint(Even)+1)
+    Rand = crypto:rand_uniform(Min,Max),
+    case Rand rem 2 of
+	0 -> 
+	    Rand + 1;
+	_ -> 
+	    Rand
     end.
 
 extended_gcd(A, B) ->
@@ -427,3 +479,4 @@ pem_to_der(File) ->
 der_to_pem(File, Entries) ->
     PemBin = public_key:pem_encode(Entries),
     file:write_file(File, PemBin).
+
diff --git a/lib/public_key/src/pubkey_pbe.erl b/lib/public_key/src/pubkey_pbe.erl
index 43f6c42f10..6f0be53db9 100644
--- a/lib/public_key/src/pubkey_pbe.erl
+++ b/lib/public_key/src/pubkey_pbe.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-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
@@ -23,7 +23,7 @@
 -include("public_key.hrl").
 
 -export([encode/4, decode/4, decrypt_parameters/1]). 
--export([pbdkdf1/4, pbdkdf2/6]).
+-export([pbdkdf1/4, pbdkdf2/7]).
 
 -define(DEFAULT_SHA_MAC_KEYLEN, 20).
 -define(ASN1_OCTET_STR_TAG, 4).
@@ -40,16 +40,16 @@
 %%--------------------------------------------------------------------
 encode(Data, Password, "DES-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
-    crypto:des_cbc_encrypt(Key, IV, Data);
+    crypto:block_encrypt(des_cbc, Key, IV, Data);
 
 encode(Data, Password, "DES-EDE3-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
     <<Key1:8/binary, Key2:8/binary, Key3:8/binary>> = Key,
-    crypto:des_ede3_cbc_encrypt(Key1, Key2, Key3, IV, Data);
+    crypto:block_encrypt(des3_cbc, [Key1, Key2, Key3], IV, Data);
 
 encode(Data, Password, "RC2-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
-    crypto:rc2_cbc_encrypt(Key, IV, Data).
+    crypto:block_encrypt(rc2_cbc, Key, IV, Data).
 %%--------------------------------------------------------------------
 -spec decode(binary(), string(), string(), term()) -> binary().
 %%
@@ -57,16 +57,16 @@ encode(Data, Password, "RC2-CBC" = Cipher, KeyDevParams) ->
 %%--------------------------------------------------------------------
 decode(Data, Password,"DES-CBC"= Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
-    crypto:des_cbc_decrypt(Key, IV, Data);
+    crypto:block_decrypt(des_cbc, Key, IV, Data);
 
 decode(Data, Password,"DES-EDE3-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
     <<Key1:8/binary, Key2:8/binary, Key3:8/binary>> = Key,
-    crypto:des_ede3_cbc_decrypt(Key1, Key2, Key3, IV, Data);
+    crypto:block_decrypt(des3_cbc, [Key1, Key2, Key3], IV, Data);
 
 decode(Data, Password,"RC2-CBC"= Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
-    crypto:rc2_cbc_decrypt(Key, IV, Data).
+    crypto:block_decrypt(rc2_cbc, Key, IV, Data).
 
 %%--------------------------------------------------------------------
 -spec pbdkdf1(string(), iodata(), integer(), atom()) -> binary().
@@ -77,21 +77,21 @@ decode(Data, Password,"RC2-CBC"= Cipher, KeyDevParams) ->
 pbdkdf1(_, _, 0, Acc) ->
     Acc;
 pbdkdf1(Password, Salt, Count, Hash) ->
-    Result = crypto:Hash([Password, Salt]),
+    Result = crypto:hash(Hash, [Password, Salt]),
     do_pbdkdf1(Result, Count-1, Result, Hash).
 
 %%--------------------------------------------------------------------
--spec pbdkdf2(string(), iodata(), integer(), integer(), fun(), integer())
+-spec pbdkdf2(string(), iodata(), integer(), integer(), fun(), atom(), integer())
 	     -> binary().
 %%
 %% Description: Implements password based decryption key derive function 2.
 %% Exported mainly for testing purposes.
 %%--------------------------------------------------------------------
-pbdkdf2(Password, Salt, Count, DerivedKeyLen, Prf, PrfOutputLen)->
+pbdkdf2(Password, Salt, Count, DerivedKeyLen, Prf, PrfHash, PrfOutputLen)->
     NumBlocks = ceiling(DerivedKeyLen / PrfOutputLen),
     NumLastBlockOctets = DerivedKeyLen - (NumBlocks - 1) * PrfOutputLen ,
     blocks(NumBlocks, NumLastBlockOctets, 1, Password, Salt, 
-	   Count, Prf, PrfOutputLen, <<>>).
+	   Count, Prf, PrfHash, PrfOutputLen, <<>>).
 %%--------------------------------------------------------------------
 -spec decrypt_parameters(#'EncryptedPrivateKeyInfo_encryptionAlgorithm'{}) -> 
 				{Cipher::string(), #'PBES2-params'{}}.
@@ -106,10 +106,10 @@ decrypt_parameters(#'EncryptedPrivateKeyInfo_encryptionAlgorithm'{
 %%% Internal functions
 %%--------------------------------------------------------------------
 password_to_key_and_iv(Password, _, #'PBES2-params'{} = Params) ->
-    {Salt, ItrCount, KeyLen, PseudoRandomFunction, PseudoOtputLen, IV} =
+    {Salt, ItrCount, KeyLen, PseudoRandomFunction, PseudoHash, PseudoOtputLen, IV} =
 	key_derivation_params(Params),
     <<Key:KeyLen/binary, _/binary>> = 
-	pbdkdf2(Password, Salt, ItrCount, KeyLen, PseudoRandomFunction, PseudoOtputLen),
+	pbdkdf2(Password, Salt, ItrCount, KeyLen, PseudoRandomFunction, PseudoHash, PseudoOtputLen),
     {Key, IV};
 password_to_key_and_iv(Password, Cipher, Salt) ->
     KeyLen = derived_key_length(Cipher, undefined),
@@ -122,13 +122,13 @@ password_to_key_and_iv(Password, Cipher, Salt) ->
 pem_encrypt(_, _, _, 0, Acc, _) ->
     Acc;
 pem_encrypt(Prev, Password, Salt, Count, Acc, Hash) ->
-    Result = crypto:Hash([Prev, Password, Salt]),
+    Result = crypto:hash(Hash, [Prev, Password, Salt]),
     pem_encrypt(Result, Password, Salt, Count-1 , <<Acc/binary, Result/binary>>, Hash).
 
 do_pbdkdf1(_, 0, Acc, _) ->
     Acc;
 do_pbdkdf1(Prev, Count, Acc, Hash) ->
-    Result = crypto:Hash(Prev),
+    Result = crypto:hash(Hash, Prev),
     do_pbdkdf1(Result, Count-1 , <<Result/binary, Acc/binary>>, Hash).
 
 iv(#'PBES2-params_encryptionScheme'{algorithm = Algo,
@@ -143,23 +143,23 @@ iv(#'PBES2-params_encryptionScheme'{algorithm = ?'rc2CBC',
     {ok, #'RC2-CBC-Parameter'{iv = IV}} = 'PKCS-FRAME':decode('RC2-CBC-Parameter', ASN1IV),
     iolist_to_binary(IV).
 
-blocks(1, N, Index, Password, Salt, Count, Prf, PrfLen, Acc) ->
-    <<XorSum:N/binary, _/binary>> = xor_sum(Password, Salt, Count, Index, Prf, PrfLen),
+blocks(1, N, Index, Password, Salt, Count, Prf, PrfHash, PrfLen, Acc) ->
+    <<XorSum:N/binary, _/binary>> = xor_sum(Password, Salt, Count, Index, Prf, PrfHash, PrfLen),
     <<Acc/binary, XorSum/binary>>;
-blocks(NumBlocks, N, Index, Password, Salt, Count, Prf, PrfLen, Acc) ->
-    XorSum = xor_sum(Password, Salt, Count, Index, Prf, PrfLen),
-    blocks(NumBlocks -1, N, Index +1, Password, Salt, Count, Prf, 
+blocks(NumBlocks, N, Index, Password, Salt, Count, Prf, PrfHash, PrfLen, Acc) ->
+    XorSum = xor_sum(Password, Salt, Count, Index, Prf, PrfHash, PrfLen),
+    blocks(NumBlocks -1, N, Index +1, Password, Salt, Count, Prf, PrfHash, 
 	   PrfLen, <<Acc/binary, XorSum/binary>>).
 
-xor_sum(Password, Salt, Count, Index, Prf, PrfLen) ->
-    Result = Prf(Password, [Salt,<<Index:32/unsigned-big-integer>>], PrfLen),
-    do_xor_sum(Prf, PrfLen, Result, Password, Count-1, Result).
+xor_sum(Password, Salt, Count, Index, Prf, PrfHash, PrfLen) ->
+    Result = Prf(PrfHash, Password, [Salt,<<Index:32/unsigned-big-integer>>], PrfLen),
+    do_xor_sum(Prf, PrfHash, PrfLen, Result, Password, Count-1, Result).
 
-do_xor_sum(_, _, _, _, 0, Acc) ->
+do_xor_sum(_, _, _, _, _, 0, Acc) ->
     Acc;
-do_xor_sum(Prf, PrfLen, Prev, Password, Count, Acc)-> 					   
-    Result = Prf(Password, Prev, PrfLen),
-    do_xor_sum(Prf, PrfLen, Result, Password, Count-1, crypto:exor(Acc, Result)).
+do_xor_sum(Prf, PrfHash, PrfLen, Prev, Password, Count, Acc)-> 					   
+    Result = Prf(PrfHash, Password, Prev, PrfLen),
+    do_xor_sum(Prf, PrfHash, PrfLen, Result, Password, Count-1, crypto:exor(Acc, Result)).
 
 decrypt_parameters(?'id-PBES2', DekParams) ->
     {ok, Params} = 'PKCS-FRAME':decode('PBES2-params', DekParams),
@@ -174,18 +174,18 @@ key_derivation_params(#'PBES2-params'{keyDerivationFunc = KeyDerivationFunc,
 							   keyLength = Length,
 							   prf = Prf}} = KeyDerivationFunc,
     #'PBES2-params_encryptionScheme'{algorithm = Algo} = EncScheme,
-    {PseudoRandomFunction, PseudoOtputLen} = pseudo_random_function(Prf),
+    {PseudoRandomFunction, PseudoHash, PseudoOtputLen} = pseudo_random_function(Prf),
     KeyLen = derived_key_length(Algo, Length),
     {OctetSalt, Count, KeyLen,
-     PseudoRandomFunction, PseudoOtputLen, iv(EncScheme)}.
+     PseudoRandomFunction, PseudoHash, PseudoOtputLen, iv(EncScheme)}.
 
 %% This function currently matches a tuple that ougth to be the value
 %% ?'id-hmacWithSHA1, but we need some kind of ASN1-fix for this.
 pseudo_random_function(#'PBKDF2-params_prf'{algorithm = 
 						{_,_, _,'id-hmacWithSHA1'}}) ->
-    {fun crypto:sha_mac/3, pseudo_output_length(?'id-hmacWithSHA1')};
+    {fun crypto:hmac/4, sha, pseudo_output_length(?'id-hmacWithSHA1')};
 pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA1'}) ->
-    {fun crypto:sha_mac/3, pseudo_output_length(?'id-hmacWithSHA1')}.
+    {fun crypto:hmac/4, sha, pseudo_output_length(?'id-hmacWithSHA1')}.
 
 pseudo_output_length(?'id-hmacWithSHA1') ->
     ?DEFAULT_SHA_MAC_KEYLEN.
diff --git a/lib/public_key/src/pubkey_ssh.erl b/lib/public_key/src/pubkey_ssh.erl
index 008ea96dd3..41280b9e14 100644
--- a/lib/public_key/src/pubkey_ssh.erl
+++ b/lib/public_key/src/pubkey_ssh.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-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
@@ -362,18 +362,18 @@ comma_list_encode([Option | Rest], Acc) ->
 ssh2_pubkey_encode(#'RSAPublicKey'{modulus = N, publicExponent = E}) ->
     TypeStr = <<"ssh-rsa">>,
     StrLen = size(TypeStr),
-    EBin = crypto:mpint(E),
-    NBin = crypto:mpint(N),
+    EBin = mpint(E),
+    NBin = mpint(N),
     <<?UINT32(StrLen), TypeStr:StrLen/binary,
       EBin/binary,
       NBin/binary>>;
 ssh2_pubkey_encode({Y,  #'Dss-Parms'{p = P, q = Q, g = G}}) ->
     TypeStr = <<"ssh-dss">>,
     StrLen = size(TypeStr),
-    PBin = crypto:mpint(P),
-    QBin = crypto:mpint(Q),
-    GBin = crypto:mpint(G),
-    YBin = crypto:mpint(Y),
+    PBin = mpint(P),
+    QBin = mpint(Q),
+    GBin = mpint(G),
+    YBin = mpint(Y),
     <<?UINT32(StrLen), TypeStr:StrLen/binary,
       PBin/binary,
       QBin/binary,
@@ -476,3 +476,32 @@ split_n(N, Bin, Acc) ->
 	[Last] ->
 	    split_n(0, <<>>, [Last | Acc])
     end.
+%% large integer in a binary with 32bit length
+%% MP representaion  (SSH2)
+mpint(X) when X < 0 -> mpint_neg(X);
+mpint(X) -> mpint_pos(X).
+
+mpint_neg(X) ->
+    Bin = int_to_bin_neg(X, []),
+    Sz = byte_size(Bin),
+    <<?UINT32(Sz), Bin/binary>>.
+    
+mpint_pos(X) ->
+    Bin = int_to_bin_pos(X, []),
+    <<MSB,_/binary>> = Bin,
+    Sz = byte_size(Bin),
+    if MSB band 16#80 == 16#80 ->
+	    <<?UINT32((Sz+1)), 0, Bin/binary>>;
+       true ->
+	    <<?UINT32(Sz), Bin/binary>>
+    end.
+
+int_to_bin_pos(0,Ds=[_|_]) ->
+    list_to_binary(Ds);
+int_to_bin_pos(X,Ds) ->
+    int_to_bin_pos(X bsr 8, [(X band 255)|Ds]).
+
+int_to_bin_neg(-1, Ds=[MSB|_]) when MSB >= 16#80 ->
+    list_to_binary(Ds);
+int_to_bin_neg(X,Ds) ->
+    int_to_bin_neg(X bsr 8, [(X band 255)|Ds]).
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 648dba3d5a..3eea6f6ec4 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -347,7 +347,7 @@ generate_key(#'ECParameters'{} = Params) ->
 compute_key(#'ECPoint'{point = Point}, #'ECPrivateKey'{privateKey = PrivKey,
 						       parameters = Param}) ->
     ECCurve = ec_curve_spec(Param),
-    crypto:compute_key(ecdh, Point, list2int(PrivKey), ECCurve).
+    crypto:compute_key(ecdh, Point, list_to_binary(PrivKey), ECCurve).
 
 compute_key(PubKey, PrivKey, #'DHParameter'{prime = P, base = G}) ->
     crypto:compute_key(dh, PubKey, PrivKey, [P, G]).
@@ -402,7 +402,7 @@ sign(DigestOrPlainText, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) ->
 sign(DigestOrPlainText, DigestType, #'ECPrivateKey'{privateKey = PrivKey,
 						    parameters = Param}) ->
     ECCurve = ec_curve_spec(Param),
-    crypto:sign(ecdsa, DigestType, DigestOrPlainText, [list2int(PrivKey), ECCurve]);
+    crypto:sign(ecdsa, DigestType, DigestOrPlainText, [list_to_binary(PrivKey), ECCurve]);
 
 %% Backwards compatible
 sign(Digest, none, #'DSAPrivateKey'{} = Key) ->
@@ -878,16 +878,8 @@ ec_curve_spec( #'ECParameters'{fieldID = FieldId, curve = PCurve, base = Base, o
 ec_curve_spec({namedCurve, OID}) ->
     pubkey_cert_records:namedCurves(OID).
 
-ec_key({PrivateKey, PubKey}, Params) ->
+ec_key({PubKey, PrivateKey}, Params) ->
     #'ECPrivateKey'{version = 1,
-		    privateKey = int2list(PrivateKey),
+		    privateKey = binary_to_list(PrivateKey),
 		    parameters = Params,
 		    publicKey = {0, PubKey}}.
-
-list2int(L) ->
-    S = length(L) * 8,
-    <<R:S/integer>> = erlang:iolist_to_binary(L),
-    R.
-int2list(I) ->
-    L = (length(integer_to_list(I, 16)) + 1) div 2,
-    binary_to_list(<<I:(L*8)>>).
diff --git a/lib/public_key/test/erl_make_certs.erl b/lib/public_key/test/erl_make_certs.erl
index b189942859..5926794ca8 100644
--- a/lib/public_key/test/erl_make_certs.erl
+++ b/lib/public_key/test/erl_make_certs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 20011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-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
@@ -114,8 +114,8 @@ verify_signature(DerEncodedCert, DerKey, _KeyParams) ->
 	#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y} ->
 	    public_key:pkix_verify(DerEncodedCert, {Y, #'Dss-Parms'{p=P, q=Q, g=G}});
 	#'ECPrivateKey'{version = _Version, privateKey = _PrivKey,
-			parameters = _Params, publicKey = _PubKey} ->
-	    public_key:pkix_verify(DerEncodedCert, Key)
+			parameters = Params, publicKey = {0, PubKey}} ->
+	    public_key:pkix_verify(DerEncodedCert, {#'ECPoint'{point = PubKey}, Params})
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%% Implementation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -253,7 +253,7 @@ extensions(Opts) ->
     end.
 
 default_extensions(Exts) ->
-    Def = [{key_usage, default},
+    Def = [{key_usage, default}, 
 	   {subject_altname, undefined},
 	   {issuer_altname, undefined},
 	   {basic_constraints, default},
@@ -267,6 +267,8 @@ default_extensions(Exts) ->
     Filter = fun({Key, _}, D) -> lists:keydelete(Key, 1, D) end,
     Exts ++ lists:foldl(Filter, Def, Exts).
        	
+
+
 extension({_, undefined}) -> [];
 extension({basic_constraints, Data}) ->
     case Data of
@@ -284,11 +286,9 @@ extension({basic_constraints, Data}) ->
 	    #'Extension'{extnID = ?'id-ce-basicConstraints',
 			 extnValue = Data}
     end;
-
 extension({key_usage, default}) ->
     #'Extension'{extnID = ?'id-ce-keyUsage',
 		 extnValue = [keyCertSign], critical = true};
-
 extension({Id, Data, Critical}) ->
     #'Extension'{extnID = Id, extnValue = Data, critical = Critical}.
 
@@ -396,37 +396,32 @@ gen_dsa2(LSize, NSize) ->
 	error -> 
 	    gen_dsa2(LSize, NSize);
 	P ->	    
-	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	    G = crypto:mod_pow(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
 	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
 	    
 	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
-	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
+	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
 	    
-	    #'DSAPrivateKey'{version=0, p=P, q=Q, g=G, y=Y, x=X}
+	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
+			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
     end.
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EC key generation  (OBS: for testing only)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-int2list(I) ->
-    L = (length(integer_to_list(I, 16)) + 1) div 2,
-    binary_to_list(<<I:(L*8)>>).
-
 gen_ec2(CurveId) ->
-    Key = crypto:ec_key_new(CurveId),
-    crypto:ec_key_generate(Key),
-    {_Curve, PrivKey, PubKey} = crypto:ec_key_to_term(Key),
+     {PubKey, PrivKey} = crypto:generate_key(ecdh, CurveId),
 
     #'ECPrivateKey'{version = 1,
-		    privateKey = int2list(PrivKey),
+		    privateKey = binary_to_list(PrivKey),
 		    parameters = {namedCurve, pubkey_cert_records:namedCurves(CurveId)},
 		    publicKey = {0, PubKey}}.
 
 %% See fips_186-3.pdf
 dsa_search(T, P0, Q, Iter) when Iter > 0 ->
     P = 2*T*Q*P0 + 1,
-    case is_prime(crypto:mpint(P), 50) of
+    case is_prime(P, 50) of
 	true -> P;
 	false -> dsa_search(T+1, P0, Q, Iter-1)
     end;
@@ -437,38 +432,40 @@ dsa_search(_,_,_,_) ->
 %%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 prime(ByteSize) ->
     Rand = odd_rand(ByteSize),
-    crypto:erlint(prime_odd(Rand, 0)).
+    prime_odd(Rand, 0).
 
 prime_odd(Rand, N) ->
     case is_prime(Rand, 50) of
 	true -> 
 	    Rand;
 	false -> 
-	    NotPrime = crypto:erlint(Rand),
-	    prime_odd(crypto:mpint(NotPrime+2), N+1)
+	    prime_odd(Rand+2, N+1)
     end.
 
 %% see http://en.wikipedia.org/wiki/Fermat_primality_test
 is_prime(_, 0) -> true;
 is_prime(Candidate, Test) -> 
-    CoPrime = odd_rand(<<0,0,0,4, 10000:32>>, Candidate),
-    case crypto:mod_exp(CoPrime, Candidate, Candidate) of
-	CoPrime -> is_prime(Candidate, Test-1);
-	_       -> false
-    end.
+    CoPrime = odd_rand(10000, Candidate),
+    Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
+    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
+
+is_prime(CoPrime, CoPrime, Candidate, Test) ->
+    is_prime(Candidate, Test-1);
+is_prime(_,_,_,_) ->
+    false.
 
 odd_rand(Size) ->
     Min = 1 bsl (Size*8-1),
     Max = (1 bsl (Size*8))-1,
-    odd_rand(crypto:mpint(Min), crypto:mpint(Max)).
+    odd_rand(Min, Max).
 
 odd_rand(Min,Max) ->
-    Rand = <<Sz:32, _/binary>> = crypto:rand_uniform(Min,Max),
-    BitSkip = (Sz+4)*8-1,
-    case Rand of
-	Odd  = <<_:BitSkip,  1:1>> -> Odd;
-	Even = <<_:BitSkip,  0:1>> -> 
-	    crypto:mpint(crypto:erlint(Even)+1)
+    Rand = crypto:rand_uniform(Min,Max),
+    case Rand rem 2 of
+	0 -> 
+	    Rand + 1;
+	_ -> 
+	    Rand
     end.
 
 extended_gcd(A, B) ->
@@ -487,3 +484,6 @@ pem_to_der(File) ->
 der_to_pem(File, Entries) ->
     PemBin = public_key:pem_encode(Entries),
     file:write_file(File, PemBin).
+
+
+
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 8fba1e8cd3..254601b107 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-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
@@ -109,7 +109,7 @@ pbdkdf2(Config) when is_list(Config) ->
     
     <<16#0c, 16#60, 16#c8, 16#0f, 16#96, 16#1f, 16#0e, 16#71,
       16#f3, 16#a9, 16#b5, 16#24, 16#af, 16#60, 16#12, 16#06,
-      16#2f, 16#e0, 16#37, 16#a6>> = pubkey_pbe:pbdkdf2("password", "salt", 1, 20, fun crypto:sha_mac/3, 20),
+      16#2f, 16#e0, 16#37, 16#a6>> = pubkey_pbe:pbdkdf2("password", "salt", 1, 20, fun crypto:hmac/4, sha, 20),
     
     %% Input:
     %%   P = "password" (8 octets)
@@ -125,7 +125,7 @@ pbdkdf2(Config) when is_list(Config) ->
     <<16#ea, 16#6c, 16#01, 16#4d, 16#c7, 16#2d, 16#6f, 16#8c, 
       16#cd, 16#1e, 16#d9, 16#2a, 16#ce, 16#1d, 16#41, 16#f0,  
       16#d8,  16#de,  16#89, 16#57>>  =
-	pubkey_pbe:pbdkdf2("password", "salt", 2, 20, fun crypto:sha_mac/3, 20),
+	pubkey_pbe:pbdkdf2("password", "salt", 2, 20, fun crypto:hmac/4, sha, 20),
 
      %% Input:
      %%   P = "password" (8 octets)
@@ -140,7 +140,7 @@ pbdkdf2(Config) when is_list(Config) ->
 
     <<16#4b, 16#00, 16#79, 16#01, 16#b7, 16#65, 16#48, 16#9a,
       16#be, 16#ad, 16#49, 16#d9, 16#26, 16#f7, 16#21, 16#d0,
-      16#65, 16#a4, 16#29, 16#c1>> = pubkey_pbe:pbdkdf2("password", "salt", 4096, 20, fun crypto:sha_mac/3, 20),
+      16#65, 16#a4, 16#29, 16#c1>> = pubkey_pbe:pbdkdf2("password", "salt", 4096, 20, fun crypto:hmac/4, sha, 20),
 
     %% Input:
     %%    P = "password" (8 octets)
@@ -156,7 +156,7 @@ pbdkdf2(Config) when is_list(Config) ->
     
     <<16#ee, 16#fe, 16#3d, 16#61, 16#cd, 16#4d, 16#a4, 16#e4, 
       16#e9, 16#94, 16#5b, 16#3d, 16#6b, 16#a2, 16#15, 16#8c, 
-      16#26, 16#34, 16#e9, 16#84>> = pubkey_pbe:pbdkdf2("password", "salt", 16777216, 20, fun crypto:sha_mac/3, 20),
+      16#26, 16#34, 16#e9, 16#84>> = pubkey_pbe:pbdkdf2("password", "salt", 16777216, 20, fun crypto:hmac/4, sha, 20),
     
     %% Input:
     %%    P = "passwordPASSWORDpassword" (24 octets)
@@ -175,7 +175,7 @@ pbdkdf2(Config) when is_list(Config) ->
       16#8b, 16#29, 16#1a, 16#96, 16#4c, 16#f2, 16#f0, 16#70, 
       16#38>>
 	= pubkey_pbe:pbdkdf2("passwordPASSWORDpassword", 
-			     "saltSALTsaltSALTsaltSALTsaltSALTsalt", 4096, 25, fun crypto:sha_mac/3, 20),
+			     "saltSALTsaltSALTsaltSALTsaltSALTsalt", 4096, 25, fun crypto:hmac/4, sha, 20),
     
      %% Input:
      %%   P = "pass\0word" (9 octets)
@@ -190,7 +190,7 @@ pbdkdf2(Config) when is_list(Config) ->
     <<16#56, 16#fa, 16#6a, 16#a7, 16#55, 16#48, 16#09, 16#9d, 
       16#cc, 16#37, 16#d7, 16#f0, 16#34, 16#25, 16#e0, 16#c3>>
 	= pubkey_pbe:pbdkdf2("pass\0word", 
-			     "sa\0lt", 4096, 16, fun crypto:sha_mac/3, 20).
+			     "sa\0lt", 4096, 16, fun crypto:hmac/4, sha, 20).
     
 encrypted_private_key_info() ->
     [{doc,"Tests reading a EncryptedPrivateKeyInfo file encrypted with different ciphers"}].
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index 8cdf0aaae3..c490493e13 100644
--- a/lib/public_key/test/pkits_SUITE.erl
+++ b/lib/public_key/test/pkits_SUITE.erl
@@ -758,7 +758,9 @@ warning(Format, Args, File0, Line) ->
     io:format("~s(~p): Warning "++Format, [File,Line|Args]).
 
 crypto_support_check(Config) ->
-    case proplists:get_bool(sha256, crypto:algorithms()) of
+    CryptoSupport = crypto:supports(),
+    Hashs = proplists:get_value(hashs, CryptoSupport),
+    case proplists:get_bool(sha256, Hashs) of
 	true ->
 	    Config;
 	false ->
diff --git a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
index 3c4ba1af66..e675cf1b83 100644
--- a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
+++ b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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
@@ -214,12 +214,12 @@ check_user(User) ->
     case element(?usmUserAuthProtocol, User) of
 	?usmNoAuthProtocol -> ok;
 	?usmHMACMD5AuthProtocol ->
-	    case is_crypto_supported(md5_mac_96) of
+	    case is_crypto_supported(md5) of
 		true -> ok;
 		false -> exit({unsupported_crypto, md5_mac_96})
 	    end;
 	?usmHMACSHAAuthProtocol ->
-	    case is_crypto_supported(sha_mac_96) of
+	    case is_crypto_supported(sha) of
 		true -> ok;
 		false -> exit({unsupported_crypto, sha_mac_96})
 	    end
@@ -227,14 +227,14 @@ check_user(User) ->
     case element(?usmUserPrivProtocol, User) of
 	?usmNoPrivProtocol -> ok;
 	?usmDESPrivProtocol ->
-	    case is_crypto_supported(des_cbc_decrypt) of
+	    case is_crypto_supported(des_cbc) of
 		true -> ok;
-		false -> exit({unsupported_crypto, des_cbc_decrypt})
+		false -> exit({unsupported_crypto, des_cbc})
 	    end;
 	?usmAesCfb128Protocol ->
-	    case is_crypto_supported(aes_cfb_128_decrypt) of
+	    case is_crypto_supported(aes_cfb128) of
 		true -> ok;
-		false -> exit({unsupported_crypto, aes_cfb_128_decrypt})
+		false -> exit({unsupported_crypto, aes_cfb128})
 	    end
     end.
     
@@ -874,13 +874,13 @@ validate_auth_protocol(RowIndex, Cols) ->
 				_ -> inconsistentValue(?usmUserAuthProtocol)
 			    end;
 			?usmHMACMD5AuthProtocol ->
-			    case is_crypto_supported(md5_mac_96) of
+			    case is_crypto_supported(md5) of
 				true -> ok;
 				false ->
 				    wrongValue(?usmUserAuthProtocol)
 			    end;
 			?usmHMACSHAAuthProtocol ->
-			    case is_crypto_supported(sha_mac_96) of
+			    case is_crypto_supported(sha) of
 				true -> ok;
 				false ->
 				    wrongValue(?usmUserAuthProtocol)
@@ -1008,7 +1008,7 @@ validate_priv_protocol(RowIndex, Cols) ->
 			?usmDESPrivProtocol ->
 			    %% The 'catch' handles the case when 'crypto' is
 			    %% not present in the system.
-			    case is_crypto_supported(des_cbc_decrypt) of
+			    case is_crypto_supported(des_cbc) of
 				true ->
 				    case get_auth_proto(RowIndex, Cols) of
 					?usmNoAuthProtocol ->
@@ -1022,7 +1022,7 @@ validate_priv_protocol(RowIndex, Cols) ->
 			?usmAesCfb128Protocol ->
 			    %% The 'catch' handles the case when 'crypto' is
 			    %% not present in the system.
-			    case is_crypto_supported(aes_cfb_128_decrypt) of
+			    case is_crypto_supported(aes_cfb128) of
 				true ->
 				    case get_auth_proto(RowIndex, Cols) of
 					?usmNoAuthProtocol ->
@@ -1164,7 +1164,7 @@ mk_key_change(Hash, OldKey, NewKey) ->
 %% case in the standard where Random is pre-defined.
 mk_key_change(Alg, OldKey, NewKey, KeyLen, Random) ->
     %% OldKey and Random is of length KeyLen...
-    Digest = lists:sublist(binary_to_list(crypto:Alg(OldKey++Random)), KeyLen),
+    Digest = lists:sublist(binary_to_list(crypto:hash(Alg, OldKey++Random)), KeyLen),
     %% ... and so is Digest
     Delta = snmp_misc:str_xor(Digest, NewKey),
     Random ++ Delta.
@@ -1181,7 +1181,7 @@ extract_new_key(Hash, OldKey, KeyChange) ->
 	      sha -> sha
 	  end,
     {Random, Delta} = split(KeyLen, KeyChange, []),
-    Digest = lists:sublist(binary_to_list(crypto:Alg(OldKey++Random)), KeyLen),
+    Digest = lists:sublist(binary_to_list(crypto:hash(Alg, OldKey++Random)), KeyLen),
     NewKey = snmp_misc:str_xor(Digest, Delta),
     NewKey.
 
@@ -1219,10 +1219,13 @@ split(N, [H | T], FirstRev) when N > 0 ->
     split(N-1, T, [H | FirstRev]).
 
 
-is_crypto_supported(Func) ->
+is_crypto_supported(Algo) ->
     %% The 'catch' handles the case when 'crypto' is
     %% not present in the system (or not started).
-    case catch lists:member(Func, crypto:info()) of
+    Supported = crypto:supports(),
+    Hashs = proplists:get_value(hashs, Supported),
+    Ciphers = proplists:get_value(ciphers, Supported),
+    case catch lists:member(Algo, Hashs ++ Ciphers) of
 	true -> true;
 	_ -> false
     end.
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index df2c1f0b18..53c291ca0e 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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
@@ -69,7 +69,7 @@ passwd2localized_key(Alg, Passwd, EngineID) when length(Passwd) > 0 ->
 %%-----------------------------------------------------------------
 localize_key(Alg, Key, EngineID) ->
     Str = [Key, EngineID, Key],
-    binary_to_list(crypto:Alg(Str)).
+    binary_to_list(crypto:hash(Alg, Str)).
 
 
 mk_digest(md5, Passwd) ->
@@ -78,25 +78,25 @@ mk_digest(sha, Passwd) ->
     mk_sha_digest(Passwd).
 
 mk_md5_digest(Passwd) ->
-    Ctx = crypto:md5_init(),
+    Ctx = crypto:hash_init(md5),
     Ctx2 = md5_loop(0, [], Ctx, Passwd, length(Passwd)),
-    crypto:md5_final(Ctx2).
+    crypto:hash_final(Ctx2).
 
 md5_loop(Count, Buf, Ctx, Passwd, PasswdLen) when Count < 1048576 ->
     {Buf64, NBuf} = mk_buf64(length(Buf), Buf, Passwd, PasswdLen),
-    NCtx = crypto:md5_update(Ctx, Buf64),
+    NCtx = crypto:hash_update(Ctx, Buf64),
     md5_loop(Count+64, NBuf, NCtx, Passwd, PasswdLen);
 md5_loop(_Count, _Buf, Ctx, _Passwd, _PasswdLen) ->
     Ctx.
 
 mk_sha_digest(Passwd) ->
-    Ctx = crypto:sha_init(),
+    Ctx = crypto:hash_init(sha),
     Ctx2 = sha_loop(0, [], Ctx, Passwd, length(Passwd)),
-    crypto:sha_final(Ctx2).
+    crypto:hash_final(Ctx2).
 
 sha_loop(Count, Buf, Ctx, Passwd, PasswdLen) when Count < 1048576 ->
     {Buf64, NBuf} = mk_buf64(length(Buf), Buf, Passwd, PasswdLen),
-    NCtx = crypto:sha_update(Ctx, Buf64),
+    NCtx = crypto:hash_update(Ctx, Buf64),
     sha_loop(Count+64, NBuf, NCtx, Passwd, PasswdLen);
 sha_loop(_Count, _Buf, Ctx, _Passwd, _PasswdLen) ->
     Ctx.
@@ -147,7 +147,12 @@ md5_auth_out(AuthKey, Message, UsmSecParams) ->
     Packet = snmp_pdus:enc_message_only(Message2),
     %% 6.3.1.2-4 is done by the crypto function
     %% 6.3.1.4
-    MAC = binary_to_list(crypto:md5_mac_96(AuthKey, Packet)),
+    MAC = binary_to_list(crypto:hmac(md5, AuthKey, Packet, 12)),
+    ?vtrace("md5_auth_out -> entry with"
+    	    "~n   Packet:    ~w"
+     	    "~n   AuthKey:   ~w"
+     	    "~n   MAC:       ~w"
+    , [Packet, AuthKey, MAC]),
     %% 6.3.1.5
     set_msg_auth_params(Message, UsmSecParams, MAC).
 
@@ -155,13 +160,14 @@ md5_auth_in(AuthKey, AuthParams, Packet) when length(AuthParams) == 12 ->
     %% 6.3.2.3
     Packet2 = patch_packet(binary_to_list(Packet)),
     %% 6.3.2.5
-    MAC = binary_to_list(crypto:md5_mac_96(AuthKey, Packet2)),
+    MAC = binary_to_list(crypto:hmac(md5, AuthKey, Packet2, 12)),
     %% 6.3.2.6
-%%     ?vtrace("md5_auth_in -> entry with"
-%% 	    "~n   Packet2:    ~w"
-%% 	    "~n   AuthKey:    ~w"
-%% 	    "~n   AuthParams: ~w"
-%% 	    "~n   MAC:        ~w", [Packet2, AuthKey, AuthParams, MAC]),
+    ?vtrace("md5_auth_in -> entry with"
+     	    "~n   Packet2:    ~w"
+     	    "~n   AuthKey:    ~w"
+     	    "~n   AuthParams: ~w"
+     	    "~n   MAC:        ~w"
+     	    , [Packet2, AuthKey, AuthParams, MAC]),
     MAC == AuthParams;
 md5_auth_in(_AuthKey, _AuthParams, _Packet) ->
     %% 6.3.2.1
@@ -177,7 +183,7 @@ sha_auth_out(AuthKey, Message, UsmSecParams) ->
     Packet = snmp_pdus:enc_message_only(Message2),
     %% 7.3.1.2-4 is done by the crypto function
     %% 7.3.1.4
-    MAC = binary_to_list(crypto:sha_mac_96(AuthKey, Packet)),
+    MAC = binary_to_list(crypto:hmac(sha, AuthKey, Packet, 12)),
     %% 7.3.1.5
     set_msg_auth_params(Message, UsmSecParams, MAC).
 
@@ -185,7 +191,7 @@ sha_auth_in(AuthKey, AuthParams, Packet) when length(AuthParams) =:= 12 ->
     %% 7.3.2.3
     Packet2 = patch_packet(binary_to_list(Packet)),
     %% 7.3.2.5
-    MAC = binary_to_list(crypto:sha_mac_96(AuthKey, Packet2)),
+    MAC = binary_to_list(crypto:hmac(sha, AuthKey, Packet2, 12)),
     %% 7.3.2.6
     MAC == AuthParams;
 sha_auth_in(_AuthKey, _AuthParams, _Packet) ->
@@ -203,7 +209,7 @@ des_encrypt(PrivKey, Data, SaltFun) ->
     IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     TailLen = (8 - (length(Data) rem 8)) rem 8,
     Tail = mk_tail(TailLen),
-    EncData = crypto:des_cbc_encrypt(DesKey, IV, [Data,Tail]),
+    EncData = crypto:block_encrypt(des_cbc, DesKey, IV, [Data,Tail]),
     {ok, binary_to_list(EncData), Salt}.
 
 des_decrypt(PrivKey, MsgPrivParams, EncData) 
@@ -217,7 +223,7 @@ des_decrypt(PrivKey, MsgPrivParams, EncData)
     Salt = MsgPrivParams,
     IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
-    Data = binary_to_list(crypto:des_cbc_decrypt(DesKey, IV, EncData)),
+    Data = binary_to_list(crypto:block_decrypt(des_cbc, DesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
     {ok, Data2};
 des_decrypt(PrivKey, BadMsgPrivParams, EncData) ->
@@ -235,7 +241,7 @@ aes_encrypt(PrivKey, Data, SaltFun) ->
     EngineBoots = snmp_framework_mib:get_engine_boots(),
     EngineTime = snmp_framework_mib:get_engine_time(),
     IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
-    EncData = crypto:aes_cfb_128_encrypt(AesKey, IV, Data),
+    EncData = crypto:block_encrypt(aes_cbf128, AesKey, IV, Data),
     {ok, binary_to_list(EncData), Salt}.
 
 aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
@@ -244,7 +250,7 @@ aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
     Salt = MsgPrivParams,
     IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
-    Data = binary_to_list(crypto:aes_cfb_128_decrypt(AesKey, IV, EncData)),
+    Data = binary_to_list(crypto:block_decrypt(aes_cbf128, AesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
     {ok, Data2}.
 
diff --git a/lib/ssh/src/ssh_bits.erl b/lib/ssh/src/ssh_bits.erl
index 5841f06d70..fc6efc817f 100644
--- a/lib/ssh/src/ssh_bits.erl
+++ b/lib/ssh/src/ssh_bits.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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
@@ -33,7 +33,6 @@
 
 %% integer utils
 -export([isize/1]).
--export([irandom/1, irandom/3]).
 -export([random/1]).
 -export([xor_bits/2, fill_bits/2]).
 -export([i2bin/2, bin2i/1]).
@@ -387,31 +386,7 @@ xor_bits(XBits, YBits) ->
     <<Y:Sz, _/binary>> = YBits,
     <<(X bxor Y):Sz>>.
 
-%%
-%% irandom(N)
-%%
-%%  Generate a N bits size random number
-%%  note that the top most bit is always set
-%%  to guarantee that the number is N bits
-%%
-irandom(Bits) ->
-    irandom(Bits, 1, 0).
-
-%%
-%% irandom(N, Top, Bottom)
-%%
-%%  Generate a N bits size random number
-%% Where Top = 0 - do not set top bit
-%%           = 1 - set the most significant bit
-%%           = 2 - set two most significant bits
-%%       Bot = 0 - do not set the least signifcant bit
-%%       Bot = 1 - set the least signifcant bit (i.e always odd)
-%%
-irandom(Bits, Top, Bottom) when is_integer(Top),
-                                0 =< Top, Top =< 2 ->
-    crypto:erlint(crypto:strong_rand_mpint(Bits, Top - 1, Bottom)).
 
-%%
 %% random/1
 %%   Generate N random bytes
 %%
diff --git a/lib/ssh/src/ssh_math.erl b/lib/ssh/src/ssh_math.erl
index 4aa385b18d..569c1cb58d 100644
--- a/lib/ssh/src/ssh_math.erl
+++ b/lib/ssh/src/ssh_math.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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
@@ -23,109 +23,19 @@
 
 -module(ssh_math).
 
--export([ilog2/1, ipow/3, invert/2, ipow2/3]).
+-export([ipow/3]).
 	 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% INTEGER utils
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% number of bits (used) in a integer = isize(N) = |log2(N)|+1
-ilog2(N) ->
-    ssh_bits:isize(N) - 1.
-
-
 %% calculate A^B mod M
 ipow(A, B, M) when M > 0, B >= 0 ->
-    crypto:mod_exp(A, B, M).
-
-ipow2(A, B, M) when M > 0, B >= 0 ->
-    if A == 1 -> 
- 	    1;
-       true -> 
- 	    ipow2(A, B, M, 1)
-    end.
-
-ipow2(A, 1, M, Prod) ->
-    (A*Prod) rem M;
-ipow2(_A, 0, _M, Prod) ->
-    Prod;
-ipow2(A, B, M, Prod)  ->
-    B1 = B bsr 1,
-    A1 = (A*A) rem M,
-    if B - B1 == B1 ->
-	    ipow2(A1, B1, M, Prod);
-       true ->
-	    ipow2(A1, B1, M, (A*Prod) rem M)
-    end.
-
-%% %%
-%% %% Normal gcd
-%% %%
-%% gcd(R, Q) when abs(Q) < abs(R) -> gcd1(Q,R);
-%% gcd(R, Q) -> gcd1(R,Q).
-
-%% gcd1(0, Q) -> Q;
-%% gcd1(R, Q) ->
-%%     gcd1(Q rem R, R).
-
-
-%% %%
-%% %% Least common multiple of (R,Q)
-%% %%
-%% lcm(0, _Q) -> 0;
-%% lcm(_R, 0) -> 0;
-%% lcm(R, Q) ->
-%%     (Q div gcd(R, Q)) * R.
-
-%% %%
-%% %% Extended gcd gcd(R,Q) -> {G, {A,B}} such that G == R*A + Q*B
-%% %%
-%% %% Here we could have use for a bif divrem(Q, R) -> {Quote, Remainder}
-%% %%
-%% egcd(R,Q) when abs(Q) < abs(R) -> egcd1(Q,R,1,0,0,1);
-%% egcd(R,Q) -> egcd1(R,Q,0,1,1,0).
-
-%% egcd1(0,Q,_,_,Q1,Q2) -> {Q, {Q2,Q1}};
-%% egcd1(R,Q,R1,R2,Q1,Q2) ->
-%%     D = Q div R,
-%%     egcd1(Q rem R, R, Q1-D*R1, Q2-D*R2, R1, R2).
-
-%%
-%% Invert an element X mod P
-%% Calculated as {1, {A,B}} = egcd(X,P),
-%%   1 == P*A + X*B == X*B (mod P) i.e B is the inverse element
-%%
-%% X > 0, P > 0, X < P   (P should be prime)
-%%
-invert(X,P) when X > 0, P > 0, X < P ->
-    I = inv(X,P,1,0),
-    if 
-        I < 0 -> P + I;
-        true -> I
-    end.
-
-inv(0,_,_,Q) -> Q;
-inv(X,P,R1,Q1) ->
-    D = P div X,
-    inv(P rem X, X, Q1 - D*R1, R1).
-
+    crypto:bytes_to_integer(crypto:mod_pow(A, B, M)).
 
-%% %%
-%% %% Integer square root
-%% %%
 
-%% isqrt(0) -> 0;
-%% isqrt(1) -> 1;
-%% isqrt(X) when X >= 0 ->
-%%     R = X div 2,
-%%     isqrt(X div R, R, X).
 
-%% isqrt(Q,R,X) when Q < R ->
-%%     R1 = (R+Q) div 2,
-%%     isqrt(X div R1, R1, X);
-%% isqrt(_, R, _) -> R.
 
 
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 98d59d01de..beaffdc025 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -792,14 +792,14 @@ encrypt(#ssh{encrypt = none} = Ssh, Data) ->
 encrypt(#ssh{encrypt = '3des-cbc',
 	     encrypt_keys = {K1,K2,K3},
 	     encrypt_ctx = IV0} = Ssh, Data) ->
-    Enc = crypto:des3_cbc_encrypt(K1,K2,K3,IV0,Data),
-    IV = crypto:des_cbc_ivec(Enc),
+    Enc = crypto:block_encrypt(des3_cbc, [K1,K2,K3], IV0, Data),
+    IV = crypto:next_iv(des3_cbc, Enc),
     {Ssh#ssh{encrypt_ctx = IV}, Enc};
 encrypt(#ssh{encrypt = 'aes128-cbc',
             encrypt_keys = K,
             encrypt_ctx = IV0} = Ssh, Data) ->
-    Enc = crypto:aes_cbc_128_encrypt(K,IV0,Data),
-    IV = crypto:aes_cbc_ivec(Enc),
+    Enc = crypto:block_encrypt(aes_cbc128, K,IV0,Data),
+    IV = crypto:next_iv(aes_cbc, Enc),
     {Ssh#ssh{encrypt_ctx = IV}, Enc}.
   
 
@@ -846,13 +846,13 @@ decrypt(#ssh{decrypt = none} = Ssh, Data) ->
 decrypt(#ssh{decrypt = '3des-cbc', decrypt_keys = Keys,
 	     decrypt_ctx = IV0} = Ssh, Data) ->
     {K1, K2, K3} = Keys,
-    Dec = crypto:des3_cbc_decrypt(K1,K2,K3,IV0,Data),
-    IV = crypto:des_cbc_ivec(Data),
+    Dec = crypto:block_decrypt(des3_cbc, [K1,K2,K3], IV0, Data),
+    IV = crypto:next_iv(des3_cbc, Data),
     {Ssh#ssh{decrypt_ctx = IV}, Dec};
 decrypt(#ssh{decrypt = 'aes128-cbc', decrypt_keys = Key,
 	     decrypt_ctx = IV0} = Ssh, Data) ->
-    Dec = crypto:aes_cbc_128_decrypt(Key,IV0,Data),
-    IV = crypto:aes_cbc_ivec(Data),
+    Dec = crypto:block_decrypt(aes_cbc128, Key,IV0,Data),
+    IV = crypto:next_iv(aes_cbc, Data),
     {Ssh#ssh{decrypt_ctx = IV}, Dec}.
 
 
@@ -954,22 +954,22 @@ recv_mac_final(SSH) ->
 mac(none, _ , _, _) ->  
     <<>>;
 mac('hmac-sha1', Key, SeqNum, Data) ->
-    crypto:sha_mac(Key, [<<?UINT32(SeqNum)>>, Data]);
+    crypto:hmac(sha, Key, [<<?UINT32(SeqNum)>>, Data]);
 mac('hmac-sha1-96', Key, SeqNum, Data) ->
-    crypto:sha_mac_96(Key, [<<?UINT32(SeqNum)>>, Data]);
+    crypto:hmac(sha, Key, [<<?UINT32(SeqNum)>>, Data], mac_digest_size('hmac-sha1-96'));
 mac('hmac-md5', Key, SeqNum, Data) ->
-    crypto:md5_mac(Key, [<<?UINT32(SeqNum)>>, Data]);
+    crypto:hmac(md5, Key, [<<?UINT32(SeqNum)>>, Data]);
 mac('hmac-md5-96', Key, SeqNum, Data) ->
-    crypto:md5_mac_96(Key, [<<?UINT32(SeqNum)>>, Data]).
+    crypto:hmac(md5, Key, [<<?UINT32(SeqNum)>>, Data], mac_digest_size('hmac-md5-96')).
 
 %% return N hash bytes (HASH)
 hash(SSH, Char, Bits) ->
     HASH =
 	case SSH#ssh.kex of
 	    'diffie-hellman-group1-sha1' ->
-		fun(Data) -> crypto:sha(Data) end;
+		fun(Data) -> crypto:hash(sha, Data) end;
 	    'diffie-hellman-group-exchange-sha1' ->
-		fun(Data) -> crypto:sha(Data) end;
+		fun(Data) -> crypto:hash(sha, Data) end;
 	    _ ->
 		exit({bad_algorithm,SSH#ssh.kex})
 	end,
@@ -998,7 +998,7 @@ kex_h(SSH, K_S, E, F, K) ->
 			 K_S, E,F,K],
 			[string,string,binary,binary,binary,
 			 mpint,mpint,mpint]),
-    crypto:sha(L).
+    crypto:hash(sha,L).
  
 
 kex_h(SSH, K_S, Min, NBits, Max, Prime, Gen, E, F, K) ->
@@ -1019,7 +1019,7 @@ kex_h(SSH, K_S, Min, NBits, Max, Prime, Gen, E, F, K) ->
 				 K_S, Min, NBits, Max,
 				 Prime, Gen, E,F,K], Ts)
 	end,
-    crypto:sha(L).
+    crypto:hash(sha,L).
   
 mac_key_size('hmac-sha1')    -> 20*8;
 mac_key_size('hmac-sha1-96') -> 20*8;
@@ -1045,10 +1045,9 @@ peer_name({Host, _}) ->
 dh_group1() ->
     {2, 16#FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF}.
 
-dh_gen_key(G, P, _Bits) ->
-    Private = ssh_bits:irandom(ssh_bits:isize(P)-1, 1, 1),
-    Public = ssh_math:ipow(G, Private, P),
-    {Private,Public}.
+dh_gen_key(G, P, _) ->
+    {Public, Private} = crypto:generate_key(dh, [P, G]),
+    {crypto:bytes_to_integer(Private), crypto:bytes_to_integer(Public)}.
 
 trim_tail(Str) ->
     lists:reverse(trim_head(lists:reverse(Str))).
@@ -1058,3 +1057,5 @@ trim_head([$\t|Cs]) -> trim_head(Cs);
 trim_head([$\n|Cs]) -> trim_head(Cs);
 trim_head([$\r|Cs]) -> trim_head(Cs);
 trim_head(Cs) -> Cs.
+
+
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index d3ba76d34e..3b8145089e 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -66,7 +66,7 @@ MODULES= \
 
 INTERNAL_HRL_FILES = \
 	 ssl_alert.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_internal.hrl \
-	 ssl_record.hrl ssl_srp.hrl ssl_srp_primes.hrl
+	 ssl_record.hrl ssl_srp.hrl
 
 ERL_FILES= \
 	$(MODULES:%=%.erl) \
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index f52862729a..fb64a6652f 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -37,7 +37,6 @@
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
 -include("ssl_handshake.hrl").
--include("ssl_srp_primes.hrl").
 
 -include_lib("public_key/include/public_key.hrl"). 
 
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index dc413d6dfc..898b421dff 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -1024,30 +1024,32 @@ filter(DerCert, Ciphers) ->
 %% Description: filter suites for algorithms
 %%-------------------------------------------------------------------
 filter_suites(Suites = [{_,_,_}|_]) ->
-    Algos = crypto:algorithms(),
+    Algos = crypto:supports(),
     lists:filter(fun({KeyExchange, Cipher, Hash}) ->
-			 is_acceptable_keyexchange(KeyExchange, Algos) andalso
-			     is_acceptable_cipher(Cipher, Algos) andalso
-			     is_acceptable_hash(Hash, Algos)
+			 is_acceptable_keyexchange(KeyExchange,  proplists:get_value(public_keys, Algos)) andalso
+			     is_acceptable_cipher(Cipher,  proplists:get_value(ciphers, Algos)) andalso
+			     is_acceptable_hash(Hash,  proplists:get_value(hashs, Algos))
 		 end, Suites);
 
 filter_suites(Suites = [{_,_,_,_}|_]) ->
-    Algos = crypto:algorithms(),
+    Algos = crypto:supports(),
+    Hashs =  proplists:get_value(hashs, Algos),
     lists:filter(fun({KeyExchange, Cipher, Hash, Prf}) ->
-			 is_acceptable_keyexchange(KeyExchange, Algos) andalso
-			     is_acceptable_cipher(Cipher, Algos) andalso
-			     is_acceptable_hash(Hash, Algos) andalso
-			     is_acceptable_prf(Prf, Algos)
+			 is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso
+			     is_acceptable_cipher(Cipher, proplists:get_value(ciphers, Algos)) andalso
+			     is_acceptable_hash(Hash, Hashs) andalso
+			     is_acceptable_prf(Prf, Hashs)
 		 end, Suites);
 
 filter_suites(Suites) ->
-    Algos = crypto:algorithms(),
+    Algos = crypto:supports(),
+    Hashs =  proplists:get_value(hashs, Algos),
     lists:filter(fun(Suite) ->
 			 {KeyExchange, Cipher, Hash, Prf} = ssl_cipher:suite_definition(Suite),
-			 is_acceptable_keyexchange(KeyExchange, Algos) andalso
-			     is_acceptable_cipher(Cipher, Algos) andalso
-			     is_acceptable_hash(Hash, Algos) andalso
-			     is_acceptable_prf(Prf, Algos)
+			 is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso
+			     is_acceptable_cipher(Cipher,  proplists:get_value(ciphers, Algos)) andalso
+			     is_acceptable_hash(Hash, Hashs) andalso
+			     is_acceptable_prf(Prf, Hashs)
 		 end, Suites).
 
 is_acceptable_keyexchange(KeyExchange, Algos)
@@ -1056,7 +1058,7 @@ is_acceptable_keyexchange(KeyExchange, Algos)
        KeyExchange == ecdh_rsa;
        KeyExchange == ecdhe_rsa;
        KeyExchange == ecdh_anon ->
-    proplists:get_bool(ec, Algos);
+    proplists:get_bool(ecdh, Algos);
 is_acceptable_keyexchange(_, _) ->
     true.
 
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 54eed03d3c..de9260fd8c 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -35,7 +35,6 @@
 -include("ssl_cipher.hrl"). 
 -include("ssl_internal.hrl").
 -include("ssl_srp.hrl").
--include("ssl_srp_primes.hrl").
 -include_lib("public_key/include/public_key.hrl"). 
 
 %% Internal application API
@@ -2216,7 +2215,7 @@ client_srp_master_secret(Generator, Prime, Salt, ServerPub, ClientKeys,
     case ssl_srp_primes:check_srp_params(Generator, Prime) of
 	ok ->
 	    {Username, Password} = SslOpts#ssl_options.srp_identity,
-	    DerivedKey = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
+	    DerivedKey = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
 	    case crypto:compute_key(srp, ServerPub, ClientKeys, {user, [DerivedKey, Prime, Generator, '6a']}) of
 		error ->
 		    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index e358cbe9bb..24ea86311f 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -840,7 +840,8 @@ select_next_protocol(Protocols, NextProtocolSelector) ->
     end.
 
 default_ecc_extensions(Version) ->
-    case proplists:get_bool(ec, crypto:algorithms()) of
+    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
+    case proplists:get_bool(ecdh, CryptoSupport) of
 	true ->
 	    EcPointFormats = #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]},
 	    EllipticCurves = #elliptic_curves{elliptic_curve_list = ssl_tls1:ecc_curves(Version)},
@@ -850,7 +851,8 @@ default_ecc_extensions(Version) ->
     end.
 
 handle_ecc_extensions(Version, EcPointFormats0, EllipticCurves0) ->
-    case proplists:get_bool(ec, crypto:algorithms()) of
+    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
+    case proplists:get_bool(ecdh, CryptoSupport) of
 	true ->
 	    EcPointFormats1 = handle_ecc_point_fmt_extension(EcPointFormats0),
 	    EllipticCurves1 = handle_ecc_curves_extension(Version, EllipticCurves0),
@@ -1767,7 +1769,8 @@ default_hash_signs() ->
 		 ?TLSEXT_SIGALG(sha),
 		 ?TLSEXT_SIGALG_DSA(sha),
 		 ?TLSEXT_SIGALG_RSA(md5)],
-    HasECC = proplists:get_bool(ec, crypto:algorithms()),
+    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
+    HasECC = proplists:get_bool(ecdsa, CryptoSupport),
     #hash_sign_algos{hash_sign_algos =
 			 lists:filter(fun({_, ecdsa}) -> HasECC;
 					 (_) -> true end, HashSigns)}.
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 50b1b2cda9..2a3356d60f 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -712,4 +712,5 @@ mac_hash({3, N} = Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment)
 		      Length, Fragment).
 
 sufficient_tlsv1_2_crypto_support() ->
-    proplists:get_bool(sha256, crypto:algorithms()).
+    CryptoSupport = crypto:supports(),
+    proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)).
diff --git a/lib/ssl/src/ssl_srp_primes.hrl b/lib/ssl/src/ssl_srp_primes.hrl
deleted file mode 100644
index 4bd534efbf..0000000000
--- a/lib/ssl/src/ssl_srp_primes.hrl
+++ /dev/null
@@ -1 +0,0 @@
--type srp_parameters() :: srp_1024 | srp_1536 | srp_2048 | srp_3072 | srp_4096 | srp_6144 | srp_8192.
diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/ssl_tls1.erl
index f8fd9efd07..8ab66d0627 100644
--- a/lib/ssl/src/ssl_tls1.erl
+++ b/lib/ssl/src/ssl_tls1.erl
@@ -184,6 +184,22 @@ mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor},
 -spec suites(1|2|3) -> [cipher_suite()].
     
 suites(Minor) when Minor == 1; Minor == 2->
+    case sufficent_ec_support() of
+	true ->
+	    all_suites(Minor);
+	false ->
+	    no_ec_suites(Minor)
+    end;
+
+suites(Minor) when Minor == 3 ->
+    case sufficent_ec_support() of
+	true ->
+	    all_suites(3) ++ all_suites(2);
+	false ->
+	    no_ec_suites(3) ++ no_ec_suites(2)
+    end.
+
+all_suites(Minor) when Minor == 1; Minor == 2->		
     [ 
       ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
       ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
@@ -208,7 +224,7 @@ suites(Minor) when Minor == 1; Minor == 2->
       ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
       ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_RSA_WITH_AES_128_CBC_SHA,
-      %%?TLS_RSA_WITH_IDEA_CBC_SHA,
+      
       ?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
       ?TLS_ECDHE_RSA_WITH_RC4_128_SHA,
       ?TLS_RSA_WITH_RC4_128_SHA,
@@ -216,31 +232,55 @@ suites(Minor) when Minor == 1; Minor == 2->
       ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
       ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
       ?TLS_ECDH_RSA_WITH_RC4_128_SHA,
+      
       ?TLS_RSA_WITH_DES_CBC_SHA
-     ];
-
-suites(Minor) when Minor == 3 ->
+    ];
+all_suites(3) ->	
     [
      ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
-
+     
      ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
      ?TLS_RSA_WITH_AES_256_CBC_SHA256,
-
+     
      ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
      ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
      ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256,
      ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256,
+     
+     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
+     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA256
+    ].
 
+no_ec_suites(Minor) when Minor == 1; Minor == 2->		
+    [ 
+      ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
+      ?TLS_RSA_WITH_AES_256_CBC_SHA,
+      ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
+      ?TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+      ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
+      ?TLS_RSA_WITH_AES_128_CBC_SHA,
+      ?TLS_RSA_WITH_RC4_128_SHA,
+      ?TLS_RSA_WITH_RC4_128_MD5,
+      ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
+      ?TLS_RSA_WITH_DES_CBC_SHA
+    ];
+no_ec_suites(3) ->	
+    [
+     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
+     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
+     ?TLS_RSA_WITH_AES_256_CBC_SHA256,
      ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
      ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
      ?TLS_RSA_WITH_AES_128_CBC_SHA256
-     %% ?TLS_DH_anon_WITH_AES_128_CBC_SHA256,
-     %% ?TLS_DH_anon_WITH_AES_256_CBC_SHA256
-	] ++ suites(2).
+    ].
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -386,3 +426,7 @@ enum_to_oid(22) -> ?secp256k1;
 enum_to_oid(23) -> ?secp256r1;
 enum_to_oid(24) -> ?secp384r1;
 enum_to_oid(25) -> ?secp521r1.
+
+sufficent_ec_support() ->
+    CryptoSupport = crypto:supports(),
+    proplists:get_bool(ecdh, proplists:get_value(public_keys, CryptoSupport)).
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl
index 723ccf4496..22dc951ac1 100644
--- a/lib/ssl/test/erl_make_certs.erl
+++ b/lib/ssl/test/erl_make_certs.erl
@@ -391,35 +391,32 @@ gen_dsa2(LSize, NSize) ->
 	error -> 
 	    gen_dsa2(LSize, NSize);
 	P ->	    
-	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	    G = crypto:mod_pow(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
 	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
 	    
 	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
-	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
+	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
 	    
-	    #'DSAPrivateKey'{version=0, p=P, q=Q, g=G, y=Y, x=X}
+	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
+			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
     end.
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EC key generation  (OBS: for testing only)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-int2list(I) ->
-    L = (length(integer_to_list(I, 16)) + 1) div 2,
-    binary_to_list(<<I:(L*8)>>).
-
 gen_ec2(CurveId) ->
-     {PrivKey, PubKey} = crypto:generate_key(ecdh, CurveId),
+     {PubKey, PrivKey} = crypto:generate_key(ecdh, CurveId),
 
     #'ECPrivateKey'{version = 1,
-		    privateKey = int2list(PrivKey),
+		    privateKey = binary_to_list(PrivKey),
 		    parameters = {namedCurve, pubkey_cert_records:namedCurves(CurveId)},
 		    publicKey = {0, PubKey}}.
 
 %% See fips_186-3.pdf
 dsa_search(T, P0, Q, Iter) when Iter > 0 ->
     P = 2*T*Q*P0 + 1,
-    case is_prime(crypto:mpint(P), 50) of
+    case is_prime(P, 50) of
 	true -> P;
 	false -> dsa_search(T+1, P0, Q, Iter-1)
     end;
@@ -430,38 +427,40 @@ dsa_search(_,_,_,_) ->
 %%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 prime(ByteSize) ->
     Rand = odd_rand(ByteSize),
-    crypto:erlint(prime_odd(Rand, 0)).
+    prime_odd(Rand, 0).
 
 prime_odd(Rand, N) ->
     case is_prime(Rand, 50) of
 	true -> 
 	    Rand;
 	false -> 
-	    NotPrime = crypto:erlint(Rand),
-	    prime_odd(crypto:mpint(NotPrime+2), N+1)
+	    prime_odd(Rand+2, N+1)
     end.
 
 %% see http://en.wikipedia.org/wiki/Fermat_primality_test
 is_prime(_, 0) -> true;
 is_prime(Candidate, Test) -> 
-    CoPrime = odd_rand(<<0,0,0,4, 10000:32>>, Candidate),
-    case crypto:mod_exp(CoPrime, Candidate, Candidate) of
-	CoPrime -> is_prime(Candidate, Test-1);
-	_       -> false
-    end.
+    CoPrime = odd_rand(10000, Candidate),
+    Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
+    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
+
+is_prime(CoPrime, CoPrime, Candidate, Test) ->
+    is_prime(Candidate, Test-1);
+is_prime(_,_,_,_) ->
+    false.
 
 odd_rand(Size) ->
     Min = 1 bsl (Size*8-1),
     Max = (1 bsl (Size*8))-1,
-    odd_rand(crypto:mpint(Min), crypto:mpint(Max)).
+    odd_rand(Min, Max).
 
 odd_rand(Min,Max) ->
-    Rand = <<Sz:32, _/binary>> = crypto:rand_uniform(Min,Max),
-    BitSkip = (Sz+4)*8-1,
-    case Rand of
-	Odd  = <<_:BitSkip,  1:1>> -> Odd;
-	Even = <<_:BitSkip,  0:1>> -> 
-	    crypto:mpint(crypto:erlint(Even)+1)
+    Rand = crypto:rand_uniform(Min,Max),
+    case Rand rem 2 of
+	0 -> 
+	    Rand + 1;
+	_ -> 
+	    Rand
     end.
 
 extended_gcd(A, B) ->
@@ -480,3 +479,4 @@ pem_to_der(File) ->
 der_to_pem(File, Entries) ->
     PemBin = public_key:pem_encode(Entries),
     file:write_file(File, PemBin).
+
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 165a8a5fcc..c4a6cf1407 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -1549,7 +1549,7 @@ ciphers_rsa_signed_certs(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
 
-    Ciphers = ssl_test_lib:rsa_suites(erlang),
+    Ciphers = ssl_test_lib:rsa_suites(crypto),
     ct:log("~p erlang cipher suites ~p~n", [Version, Ciphers]),
     run_suites(Ciphers, Version, Config, rsa).
 %%-------------------------------------------------------------------
@@ -1559,7 +1559,7 @@ ciphers_rsa_signed_certs_openssl_names() ->
 ciphers_rsa_signed_certs_openssl_names(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
-    Ciphers = ssl_test_lib:openssl_rsa_suites(),  
+    Ciphers = ssl_test_lib:openssl_rsa_suites(crypto),  
     ct:log("tls1 openssl cipher suites ~p~n", [Ciphers]),
     run_suites(Ciphers, Version, Config, rsa).
 
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index a8ff5187b6..34c52b10b3 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -285,7 +285,7 @@ user_lookup(psk, _Identity, UserState) ->
     {ok, UserState};
 user_lookup(srp, Username, _UserState) ->
     Salt = ssl:random_bytes(16),
-    UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, <<"secret">>])]),
+    UserPassHash = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, <<"secret">>])]),
     {ok, {srp_1024, Salt, UserPassHash}}.
 
 cert_options(Config) ->
@@ -405,7 +405,8 @@ make_dsa_cert(Config) ->
      | Config].
 
 make_ecdsa_cert(Config) ->
-    case proplists:get_bool(ec, crypto:algorithms()) of
+    CryptoSupport = crypto:supports(),
+    case proplists:get_bool(ecdsa, proplists:get_value(public_keys, CryptoSupport)) of
 	    true ->
 	    {ServerCaCertFile, ServerCertFile, ServerKeyFile} = make_cert_files("server", Config, ec, ec, ""),
 	    {ClientCaCertFile, ClientCertFile, ClientKeyFile} = make_cert_files("client", Config, ec, ec, ""),
@@ -429,7 +430,8 @@ make_ecdsa_cert(Config) ->
 %%    This key exchange algorithm is the same as ECDH_ECDSA except that the
 %%    server's certificate MUST be signed with RSA rather than ECDSA.
 make_ecdh_rsa_cert(Config) ->
-    case proplists:get_bool(ec, crypto:algorithms()) of
+    CryptoSupport = crypto:supports(),
+    case proplists:get_bool(ecdh, proplists:get_value(public_keys, CryptoSupport)) of
 	true ->
 	    {ServerCaCertFile, ServerCertFile, ServerKeyFile} = make_cert_files("server", Config, rsa, ec, "rsa_"),
 	    {ClientCaCertFile, ClientCertFile, ClientKeyFile} = make_cert_files("client", Config, rsa, ec, "rsa_"),
@@ -754,14 +756,20 @@ ecdh_rsa_suites() ->
 		 end,
 		 ssl:cipher_suites()).
 
-openssl_rsa_suites() ->
+openssl_rsa_suites(CounterPart) ->
     Ciphers = ssl:cipher_suites(openssl),
+    Names = case is_sane_ecc(CounterPart) of
+		true ->
+		    "DSS | ECDSA";
+		false ->
+		    "DSS | ECDHE | ECDH"
+		end,
     lists:filter(fun(Str) ->
-			 case re:run(Str,"DSS|ECDH-RSA|ECDSA",[]) of
+			 case re:run(Str, Names,[]) of
 			     nomatch ->
-				 true;
+				 false;
 			     _ ->
-				 false
+				 true
 			 end 
 		     end, Ciphers).
 
@@ -939,9 +947,11 @@ init_tls_version(Version) ->
     ssl:start().
 
 sufficient_crypto_support('tlsv1.2') ->
-    proplists:get_bool(sha256, crypto:algorithms());
+    CryptoSupport = crypto:supports(),
+    proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport));
 sufficient_crypto_support(ciphers_ec) ->
-    proplists:get_bool(ec, crypto:algorithms());
+    CryptoSupport = crypto:supports(),
+    proplists:get_bool(ecdh, proplists:get_value(public_keys, CryptoSupport));
 sufficient_crypto_support(_) ->
     true.
 
@@ -990,6 +1000,16 @@ is_sane_ecc(openssl) ->
 	_ ->
 	    true
     end;
+is_sane_ecc(crypto) ->
+    [{_,_, Bin}]  = crypto:info_lib(), 
+    case binary_to_list(Bin) of
+	"OpenSSL 0.9.8" ++ _ -> % Does not support ECC
+	    false;
+	"OpenSSL 0.9.7" ++ _ -> % Does not support ECC
+	    false;
+	_ ->
+	    true
+    end;
 is_sane_ecc(_) ->
     true.
 
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 075b4b1ec4..7f91865a86 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -106,9 +106,9 @@ init_per_suite(Config0) ->
 					      ?config(priv_dir, Config0))),
 		    ct:log("Make certs  ~p~n", [Result]),
 		    Config1 = ssl_test_lib:make_dsa_cert(Config0),
-		    Config = ssl_test_lib:cert_options(Config1),
-		    NewConfig = [{watchdog, Dog} | Config],
-		    ssl_test_lib:cipher_restriction(NewConfig)
+		    Config2 = ssl_test_lib:cert_options(Config1),
+		    Config = [{watchdog, Dog} | Config2],
+		    ssl_test_lib:cipher_restriction(Config)
 		catch _:_  ->
 		    {skip, "Crypto did not start"}
 	    end
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 7a93fa0f45..90bc4be354 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -302,10 +302,10 @@ clear_crypto_key_fun() ->
 -spec make_crypto_key(mode(), string()) ->
         {binary(), binary(), binary(), binary()}.
 
-make_crypto_key(des3_cbc, String) ->
+make_crypto_key(des3_cbc=Type, String) ->
     <<K1:8/binary,K2:8/binary>> = First = erlang:md5(String),
     <<K3:8/binary,IVec:8/binary>> = erlang:md5([First|reverse(String)]),
-    {K1,K2,K3,IVec}.
+    {Type,[K1,K2,K3],IVec,8}.
 
 %%
 %%  Local functions
@@ -864,20 +864,20 @@ mandatory_chunks() ->
 
 -define(CRYPTO_KEY_SERVER, beam_lib__crypto_key_server).
 
-decrypt_abst(Mode, Module, File, Id, AtomTable, Bin) ->
+decrypt_abst(Type, Module, File, Id, AtomTable, Bin) ->
     try
-	KeyString = get_crypto_key({debug_info, Mode, Module, File}),
-	Key = make_crypto_key(des3_cbc, KeyString),
-	Term = decrypt_abst_1(Mode, Key, Bin),
+	KeyString = get_crypto_key({debug_info, Type, Module, File}),
+	Key = make_crypto_key(Type, KeyString),
+	Term = decrypt_abst_1(Key, Bin),
 	{AtomTable, {Id, Term}}
     catch
 	_:_ ->
 	    error({key_missing_or_invalid, File, Id})
     end.
 
-decrypt_abst_1(des3_cbc, {K1, K2, K3, IVec}, Bin) ->
+decrypt_abst_1({Type,Key,IVec,_BlockSize}, Bin) ->
     ok = start_crypto(),
-    NewBin = crypto:des3_cbc_decrypt(K1, K2, K3, IVec, Bin),
+    NewBin = crypto:block_decrypt(Type, Key, IVec, Bin),
     binary_to_term(NewBin).
 
 start_crypto() ->
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index f2849e50ec..42a42b7fd7 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -75,18 +75,18 @@ obsolete_1(crypto, md5, 1) ->
 obsolete_1(crypto, sha, 1) ->
     {deprecated, {crypto, hash, 2}};
 
-obsolete_1(crypto, md4_init, 1) ->
-    {deprecated, {crypto, hash_init, 2}};
-obsolete_1(crypto, md5_init, 1) ->
-    {deprecated, {crypto, hash_init, 2}};
-obsolete_1(crypto, sha_init, 1) ->
-    {deprecated, {crypto, hash_init, 2}};
+obsolete_1(crypto, md4_init, 0) ->
+    {deprecated, {crypto, hash_init, 1}};
+obsolete_1(crypto, md5_init, 0) ->
+    {deprecated, {crypto, hash_init, 1}};
+obsolete_1(crypto, sha_init, 0) ->
+    {deprecated, {crypto, hash_init, 1}};
 
 obsolete_1(crypto, md4_update, 2) ->
     {deprecated, {crypto, hash_update, 3}};
 obsolete_1(crypto, md5_update, 2) ->
     {deprecated, {crypto, hash_update, 3}};
-obsolete_1(crypto, sah_update, 2) ->
+obsolete_1(crypto, sha_update, 2) ->
     {deprecated, {crypto, hash_update, 3}};
 
 obsolete_1(crypto, md4_final, 1) ->
@@ -100,16 +100,22 @@ obsolete_1(crypto, md5_mac, 2) ->
     {deprecated, {crypto, hmac, 3}};
 obsolete_1(crypto, sha_mac, 2) ->
     {deprecated, {crypto, hmac, 3}};
+obsolete_1(crypto, sha_mac, 3) ->
+    {deprecated, {crypto, hmac, 4}};
 
 obsolete_1(crypto, sha_mac_96, 2) ->
     {deprecated, {crypto, hmac_n, 3}};
 obsolete_1(crypto, md5_mac_96, 2) ->
     {deprecated, {crypto, hmac_n, 3}};
 
+obsolete_1(crypto, rsa_sign, 2) ->
+    {deprecated, {crypto, sign, 4}};
 obsolete_1(crypto, rsa_sign, 3) ->
     {deprecated, {crypto, sign, 4}};
 obsolete_1(crypto, rsa_verify, 3) ->
-    {deprecated, {crypto, verify, 4}};
+    {deprecated, {crypto, verify, 5}};
+obsolete_1(crypto, rsa_verify, 4) ->
+    {deprecated, {crypto, verify, 5}};
 
 obsolete_1(crypto, dss_sign, 2) ->
     {deprecated, {crypto, sign, 4}};
@@ -135,8 +141,8 @@ obsolete_1(crypto, des_cbc_encrypt, 3) ->
     {deprecated, {crypto, block_encrypt, 4}};
 obsolete_1(crypto, des3_cbc_encrypt, 5) ->
     {deprecated, {crypto, block_encrypt, 4}};
-obsolete_1(crypto, des_ecb_encrypt, 3) ->
-    {deprecated, {crypto, block_encrypt, 4}};
+obsolete_1(crypto, des_ecb_encrypt, 2) ->
+    {deprecated, {crypto, block_encrypt, 3}};
 obsolete_1(crypto, des_ede3_cbc_encrypt, 5) ->
     {deprecated, {crypto, block_encrypt, 4}};
 obsolete_1(crypto, des_cfb_encrypt, 3) ->
@@ -153,6 +159,8 @@ obsolete_1(crypto, blowfish_ofb64_encrypt, 3) ->
     {deprecated, {crypto, block_encrypt, 4}};
 obsolete_1(crypto, aes_cfb_128_encrypt, 3) ->
     {deprecated, {crypto, block_encrypt, 4}};
+obsolete_1(crypto, aes_cbc_128_encrypt, 3) ->
+    {deprecated, {crypto, block_encrypt, 4}};
 obsolete_1(crypto, aes_cbc_256_encrypt, 3) ->
     {deprecated, {crypto, block_encrypt, 4}};
 obsolete_1(crypto,rc2_cbc_encrypt, 3) ->
@@ -164,8 +172,8 @@ obsolete_1(crypto, des_cbc_decrypt, 3) ->
     {deprecated, {crypto, block_decrypt, 4}};
 obsolete_1(crypto, des3_cbc_decrypt, 5) ->
     {deprecated, {crypto, block_decrypt, 4}};
-obsolete_1(crypto, des_ecb_decrypt, 3) ->
-    {deprecated, {crypto, block_decrypt, 4}};
+obsolete_1(crypto, des_ecb_decrypt, 2) ->
+    {deprecated, {crypto, block_decrypt, 3}};
 obsolete_1(crypto, des_ede3_cbc_decrypt, 5) ->
     {deprecated, {crypto, block_decrypt, 4}};
 obsolete_1(crypto, des_cfb_decrypt, 3) ->
@@ -182,6 +190,8 @@ obsolete_1(crypto, blowfish_ofb64_decrypt, 3) ->
     {deprecated, {crypto, block_decrypt, 4}};
 obsolete_1(crypto, aes_cfb_128_decrypt, 3) ->
     {deprecated, {crypto, block_decrypt, 4}};
+obsolete_1(crypto, aes_cbc_128_decrypt, 3) ->
+    {deprecated, {crypto, block_decrypt, 4}};
 obsolete_1(crypto, aes_cbc_256_decrypt, 3) ->
     {deprecated, {crypto, block_decrypt, 4}};
 obsolete_1(crypto,rc2_cbc_decrypt, 3) ->
@@ -189,16 +199,50 @@ obsolete_1(crypto,rc2_cbc_decrypt, 3) ->
 obsolete_1(crypto,rc2_40_cbc_decrypt, 3) ->
     {deprecated, {crypto, block_decrypt, 4}};
 
+obsolete_1(crypto, aes_ctr_stream_decrypt, 2) ->
+    {deprecated, {crypto, stream_decrypt, 2}};
+obsolete_1(crypto, aes_ctr_stream_encrypt, 2) ->
+    {deprecated, {crypto, stream_encrypt, 2}};
+obsolete_1(crypto, aes_ctr_decrypt, 3) ->
+    {deprecated, {crypto, stream_decrypt, 2}};
+obsolete_1(crypto, aes_ctr_encrypt, 3) ->
+    {deprecated, {crypto, stream_encrypt, 2}};
+obsolete_1(crypto, rc4_encrypt, 2) ->
+    {deprecated, {crypto, stream_encrypt, 2}};
+obsolete_1(crypto, rc4_encrypt_with_state, 2) ->
+    {deprecated, {crypto, stream_encrypt, 2}};
+obsolete_1(crypto, aes_ctr_stream_init, 2) ->
+    {deprecated, {crypto, stream_init, 3}};
+obsolete_1(crypto, rc4_set_key, 1) ->
+    {deprecated, {crypto, stream_init, 2}};
+
+obsolete_1(crypto, rsa_private_decrypt, 3) ->
+    {deprecated, {crypto, private_decrypt, 4}};
+obsolete_1(crypto, rsa_public_decrypt, 3) ->
+    {deprecated, {crypto, public_decrypt, 4}};
+obsolete_1(crypto, rsa_private_encrypt, 3) ->
+    {deprecated, {crypto, private_encrypt, 4}};
+obsolete_1(crypto, rsa_public_encrypt, 3) ->
+    {deprecated, {crypto, public_encrypt, 4}};
+
+obsolete_1(crypto, des_cfb_ivec, 2) ->
+    {deprecated, {crypto, next_iv, 3}};
+obsolete_1(crypto,des_cbc_ivec, 1) ->
+    {deprecated, {crypto, next_iv, 2}};
+obsolete_1(crypto, aes_cbc_ivec, 1) ->
+    {deprecated, {crypto, next_iv, 2}};
+
 obsolete_1(crypto,info, 0) ->
     {deprecated, {crypto, module_info, 0}};
 
 obsolete_1(crypto, strong_rand_mpint, 3) ->
     {deprecated, "needed only by deprecated functions"};
-obsolete_1(crypto, erlint, 3) ->
+obsolete_1(crypto, erlint, 1) ->
     {deprecated, "needed only by deprecated functions"};
-obsolete_1(crypto, mpint, 3) ->
+obsolete_1(crypto, mpint, 1) ->
     {deprecated, "needed only by deprecated functions"};
 
+
 %% *** SNMP ***
 
 obsolete_1(snmp, N, A) ->