Skip to content

Commit

Permalink
Merge branch 'maint-r14' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Niclas Eklund committed Apr 20, 2011
2 parents 4dd5d2a + 459bde5 commit f228601
Show file tree
Hide file tree
Showing 11 changed files with 213 additions and 68 deletions.
61 changes: 61 additions & 0 deletions lib/crypto/c_src/crypto.c
View file
Expand Up @@ -134,7 +134,9 @@ static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_T
static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM strong_rand_mpint_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
Expand Down Expand Up @@ -204,7 +206,9 @@ static ErlNifFunc nif_funcs[] = {
{"aes_ctr_encrypt", 3, aes_ctr_encrypt},
{"aes_ctr_decrypt", 3, aes_ctr_encrypt},
{"rand_bytes", 1, rand_bytes_1},
{"strong_rand_bytes_nif", 1, strong_rand_bytes_nif},
{"rand_bytes", 3, rand_bytes_3},
{"strong_rand_mpint_nif", 3, strong_rand_mpint_nif},
{"rand_uniform_nif", 2, rand_uniform_nif},
{"mod_exp_nif", 3, mod_exp_nif},
{"dss_verify", 4, dss_verify},
Expand Down Expand Up @@ -704,6 +708,22 @@ static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
ERL_VALGRIND_MAKE_MEM_DEFINED(data, bytes);
return ret;
}
static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
{/* (Bytes) */
unsigned bytes;
unsigned char* data;
ERL_NIF_TERM ret;
if (!enif_get_uint(env, argv[0], &bytes)) {
return enif_make_badarg(env);
}
data = enif_make_new_binary(env, bytes, &ret);
if ( RAND_bytes(data, bytes) != 1) {
return atom_false;
}
ERL_VALGRIND_MAKE_MEM_DEFINED(data, bytes);
return ret;
}

static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
{/* (Bytes, TopMask, BottomMask) */
unsigned bytes;
Expand All @@ -724,6 +744,47 @@ static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
}
return ret;
}
static ERL_NIF_TERM strong_rand_mpint_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
{/* (Bytes, TopMask, BottomMask) */
unsigned bits;
BIGNUM *bn_rand;
int top, bottom;
unsigned char* data;
unsigned dlen;
ERL_NIF_TERM ret;
if (!enif_get_uint(env, argv[0], &bits)
|| !enif_get_int(env, argv[1], &top)
|| !enif_get_int(env, argv[2], &bottom)) {
return enif_make_badarg(env);
}
if (! (top == -1 || top == 0 || top == 1) ) {
return enif_make_badarg(env);
}
if (! (bottom == 0 || bottom == 1) ) {
return enif_make_badarg(env);
}

bn_rand = BN_new();
if (! bn_rand ) {
return enif_make_badarg(env);
}

/* Get a (bits) bit random number */
if (!BN_rand(bn_rand, bits, top, bottom)) {
ret = atom_false;
}
else {
/* Copy the bignum into an erlang mpint binary. */
dlen = BN_num_bytes(bn_rand);
data = enif_make_new_binary(env, dlen+4, &ret);
put_int32(data, dlen);
BN_bn2bin(bn_rand, data+4);
ERL_VALGRIND_MAKE_MEM_DEFINED(data+4, dlen);
}
BN_free(bn_rand);

return ret;
}

static int get_bn_from_mpint(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp)
{
Expand Down
42 changes: 41 additions & 1 deletion lib/crypto/doc/src/crypto.xml
View file
Expand Up @@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
<year>1999</year><year>2010</year>
<year>1999</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
Expand Down Expand Up @@ -618,6 +618,21 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
number generator.</p>
</desc>
</func>
<func>
<name>strong_rand_bytes(N) -> binary()</name>
<fsummary>Generate a binary of random bytes</fsummary>
<type>
<v>N = integer()</v>
</type>
<desc>
<p>Generates N bytes randomly uniform 0..255, and returns the
result in a binary. Uses a cryptographically secure prng seeded and
periodically mixed with operating system provided entropy. By default
this is the <c>RAND_bytes</c> method from OpenSSL.</p>
<p>May throw exception <c>low_entropy</c> in case the random generator
failed due to lack of secure "randomness".</p>
</desc>
</func>
<func>
<name>rand_uniform(Lo, Hi) -> N</name>
<fsummary>Generate a random number</fsummary>
Expand All @@ -632,6 +647,31 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
multi-precision integers.</p>
</desc>
</func>
<func>
<name>strong_rand_mpint(N, Top, Bottom) -> Mpint</name>
<fsummary>Generate an N bit random number</fsummary>
<type>
<v>N = non_neg_integer()</v>
<v>Top = -1 | 0 | 1</v>
<v>Bottom = 0 | 1</v>
<v>Mpint = binary()</v>
</type>
<desc>
<p>Generate an N bit random number using OpenSSL's
cryptographically strong pseudo random number generator
<c>BN_rand</c>.</p>
<p>The parameter <c>Top</c> places constraints on the most
significant bits of the generated number. If <c>Top</c> is 1, then the
two most significant bits will be set to 1, if <c>Top</c> is 0, the
most significant bit will be 1, and if <c>Top</c> is -1 then no
constraints are applied and thus the generated number may be less than
N bits long.</p>
<p>If <c>Bottom</c> is 1, then the generated number is
constrained to be odd.</p>
<p>May throw exception <c>low_entropy</c> in case the random generator
failed due to lack of secure "randomness".</p>
</desc>
</func>
<func>
<name>mod_exp(N, P, M) -> Result</name>
<fsummary>Perform N ^ P mod M</fsummary>
Expand Down
17 changes: 16 additions & 1 deletion lib/crypto/doc/src/notes.xml
View file
Expand Up @@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
<year>1999</year><year>2010</year>
<year>1999</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
Expand All @@ -30,6 +30,21 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>

<section><title>Crypto 2.0.2.2</title>

<section><title>Improvements and New Features</title>
<list>
<item>
<p>
Strengthened random number generation. (Thanks to Geoff Cant)</p>
<p>
Own Id: OTP-9225</p>
</item>
</list>
</section>

</section>

<section><title>Crypto 2.0.2.1</title>

<section><title>Improvements and New Features</title>
Expand Down
25 changes: 24 additions & 1 deletion lib/crypto/src/crypto.erl
View file
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
%% Copyright Ericsson AB 1999-2011. 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
Expand Down Expand Up @@ -46,6 +46,7 @@
-export([rsa_private_encrypt/3, rsa_public_decrypt/3]).
-export([dh_generate_key/1, dh_generate_key/2, dh_compute_key/3]).
-export([rand_bytes/1, rand_bytes/3, rand_uniform/2]).
-export([strong_rand_bytes/1, strong_rand_mpint/3]).
-export([mod_exp/3, mpint/1, erlint/1]).
%% -export([idea_cbc_encrypt/3, idea_cbc_decrypt/3]).
-export([aes_cbc_128_encrypt/3, aes_cbc_128_decrypt/3]).
Expand All @@ -68,6 +69,8 @@
des_ede3_cbc_encrypt, des_ede3_cbc_decrypt,
aes_cfb_128_encrypt, aes_cfb_128_decrypt,
rand_bytes,
strong_rand_bytes,
strong_rand_mpint,
rand_uniform,
mod_exp,
dss_verify,dss_sign,
Expand Down Expand Up @@ -361,12 +364,32 @@ aes_cfb_128_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
%% RAND - pseudo random numbers using RN_ functions in crypto lib
%%
-spec rand_bytes(non_neg_integer()) -> binary().
-spec strong_rand_bytes(non_neg_integer()) -> binary().
-spec rand_uniform(crypto_integer(), crypto_integer()) ->
crypto_integer().
-spec strong_rand_mpint(Bits::non_neg_integer(),
Top::-1..1,
Bottom::0..1) -> binary().

rand_bytes(_Bytes) -> ?nif_stub.

strong_rand_bytes(Bytes) ->
case strong_rand_bytes_nif(Bytes) of
false -> erlang:error(low_entropy);
Bin -> Bin
end.
strong_rand_bytes_nif(_Bytes) -> ?nif_stub.

rand_bytes(_Bytes, _Topmask, _Bottommask) -> ?nif_stub.

strong_rand_mpint(Bits, Top, Bottom) ->
case strong_rand_mpint_nif(Bits,Top,Bottom) of
false -> erlang:error(low_entropy);
Bin -> Bin
end.
strong_rand_mpint_nif(_Bits, _Top, _Bottom) -> ?nif_stub.


rand_uniform(From,To) when is_binary(From), is_binary(To) ->
case rand_uniform_nif(From,To) of
<<Len:32/integer, MSB, Rest/binary>> when MSB > 127 ->
Expand Down
33 changes: 31 additions & 2 deletions lib/crypto/test/crypto_SUITE.erl
View file
Expand Up @@ -46,6 +46,7 @@
aes_ctr/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,
Expand All @@ -68,7 +69,8 @@ all() ->
md5_mac_io, sha, sha_update,
%% 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,
aes_cbc_iter, aes_ctr, des_cbc_iter, des_ecb,
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,
Expand Down Expand Up @@ -708,6 +710,33 @@ rand_uniform_aux_test(N) ->
?line t(R1 < H),
?line rand_uniform_aux_test(N-1).

%%
%%
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)).

%%
%%
%%
Expand Down Expand Up @@ -1097,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),
Expand Down
2 changes: 1 addition & 1 deletion lib/crypto/vsn.mk
View file
@@ -1 +1 @@
CRYPTO_VSN = 2.0.2.1
CRYPTO_VSN = 2.0.2.2
13 changes: 13 additions & 0 deletions lib/ssh/doc/src/notes.xml
View file
Expand Up @@ -29,6 +29,19 @@
<file>notes.xml</file>
</header>

<section><title>Ssh 2.0.5</title>
<section><title>Improvements and New Features</title>
<list>
<item>
<p>
Strengthened random number generation. (Thanks to Geoff Cant)</p>
<p>
Own Id: OTP-9225</p>
</item>
</list>
</section>
</section>

<section><title>Ssh 2.0.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
Expand Down
26 changes: 18 additions & 8 deletions lib/ssh/src/ssh.appup.src
View file
Expand Up @@ -19,34 +19,44 @@

{"%VSN%",
[
{"2.0.3", [{load_module, ssh_file, soft_purge, soft_purge, []},
{"2.0.4", [{load_module, ssh_bits, soft_purge, soft_purge, []},
{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
{"2.0.3", [{load_module, ssh_bits, soft_purge, soft_purge, []},
{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
{load_module, ssh_file, soft_purge, soft_purge, []},
{load_module, ssh, soft_purge, soft_purge, []},
{load_module, ssh_rsa, soft_purge, soft_purge, []},
{load_module, ssh_acceptor, soft_purge, soft_purge, []},
{load_module, ssh_transport, soft_purge, soft_purge, []},
{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
{"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []},
{"2.0.2", [{load_module, ssh_bits, soft_purge, soft_purge, []},
{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
{load_module, ssh_file, soft_purge, soft_purge, []},
{load_module, ssh, soft_purge, soft_purge, []},
{load_module, ssh_rsa, soft_purge, soft_purge, []},
{load_module, ssh_acceptor, soft_purge, soft_purge, []},
{load_module, ssh_transport, soft_purge, soft_purge, []},
{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
{"2.0.1", [{restart_application, ssh}]}
{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}
],
[
{"2.0.3", [{load_module, ssh_file, soft_purge, soft_purge, []},
{"2.0.4", [{load_module, ssh_bits, soft_purge, soft_purge, []},
{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
{"2.0.3", [{load_module, ssh_bits, soft_purge, soft_purge, []},
{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
{load_module, ssh_file, soft_purge, soft_purge, []},
{load_module, ssh, soft_purge, soft_purge, []},
{load_module, ssh_rsa, soft_purge, soft_purge, []},
{load_module, ssh_acceptor, soft_purge, soft_purge, []},
{load_module, ssh_transport, soft_purge, soft_purge, []},
{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
{"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []},
{"2.0.2", [{load_module, ssh_bits, soft_purge, soft_purge, []},
{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
{load_module, ssh_file, soft_purge, soft_purge, []},
{load_module, ssh, soft_purge, soft_purge, []},
{load_module, ssh_rsa, soft_purge, soft_purge, []},
{load_module, ssh_acceptor, soft_purge, soft_purge, []},
{load_module, ssh_transport, soft_purge, soft_purge, []},
{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
{"2.0.1", [{restart_application, ssh}]}
{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}
]
}.

Expand Down

0 comments on commit f228601

Please sign in to comment.