aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/test/crypto_SUITE.erl
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2011-04-19 13:35:29 +0200
committerNiclas Eklund <[email protected]>2011-04-19 13:35:29 +0200
commitafe36b58bb77012f94b19213ed9602c2eb9fd420 (patch)
treee372dab012bafe8a8cdc175343727194a746095b /lib/crypto/test/crypto_SUITE.erl
parentc31065c750e37d5368398e9e2a741a1d4ec0588c (diff)
downloadotp-afe36b58bb77012f94b19213ed9602c2eb9fd420.tar.gz
otp-afe36b58bb77012f94b19213ed9602c2eb9fd420.tar.bz2
otp-afe36b58bb77012f94b19213ed9602c2eb9fd420.zip
Renamed the function strong_rand_uniform to strong_rand_mpint.
Added some checks in crypto.erl and crypto.c. Changed ssh_bits to use strong_rand_mpint.
Diffstat (limited to 'lib/crypto/test/crypto_SUITE.erl')
-rw-r--r--lib/crypto/test/crypto_SUITE.erl38
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 1946d01489..854a8b4485 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -46,7 +46,7 @@
aes_ctr/1,
mod_exp_test/1,
rand_uniform_test/1,
- strong_rand_uniform_test/1,
+ strong_rand_test/1,
rsa_verify_test/1,
dsa_verify_test/1,
rsa_sign_test/1,
@@ -70,7 +70,7 @@ all() ->
%% sha256, sha256_update, sha512,sha512_update,
des_cbc, aes_cfb, aes_cbc,
aes_cbc_iter, aes_ctr, des_cbc_iter, des_ecb,
- rand_uniform_test, strong_rand_uniform_test,
+ rand_uniform_test, strong_rand_test,
rsa_verify_test, dsa_verify_test, rsa_sign_test,
dsa_sign_test, rsa_encrypt_decrypt, dh, exor_test,
rc4_test, rc4_stream_test, mod_exp_test, blowfish_cfb64,
@@ -712,26 +712,26 @@ rand_uniform_aux_test(N) ->
%%
%%
-strong_rand_uniform_test(doc) ->
- "strong_rand_uniform and strong_random_bytes testing";
-strong_rand_uniform_test(suite) ->
+strong_rand_test(doc) ->
+ "strong_rand_mpint and strong_random_bytes testing";
+strong_rand_test(suite) ->
[];
-strong_rand_uniform_test(Config) when is_list(Config) ->
- strong_rand_uniform_aux_test(180),
+strong_rand_test(Config) when is_list(Config) ->
+ strong_rand_aux_test(180),
?line 10 = byte_size(crypto:strong_rand_bytes(10)).
-strong_rand_uniform_aux_test(0) ->
- ?line t(crypto:strong_rand_uniform(0,0,0) =:= <<0,0,0,0>>),
+strong_rand_aux_test(0) ->
+ ?line t(crypto:strong_rand_mpint(0,0,0) =:= <<0,0,0,0>>),
ok;
-strong_rand_uniform_aux_test(1) ->
- ?line t(crypto:erlint(crypto:strong_rand_uniform(1,0,1)) =:= 1),
- ?line rand_uniform_aux_test(0);
-strong_rand_uniform_aux_test(N) ->
- ?line t(sru_length(crypto:strong_rand_uniform(N,-1,0)) =< N),
- ?line t(sru_length(crypto:strong_rand_uniform(N,0,0)) =:= N),
- ?line t(crypto:erlint(crypto:strong_rand_uniform(N,0,1)) band 1 =:= 1),
- ?line t(crypto:erlint(crypto:strong_rand_uniform(N,1,0)) bsr (N - 2) =:= 2#11),
- ?line rand_uniform_aux_test(N-1).
+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),
@@ -1126,7 +1126,7 @@ 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,
+ 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 },
F = element(random:uniform(size(Funcs)),Funcs),