diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 | 
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 | 
| commit | 18fef7c99aa36b3e5622b3865f36d78d0879e92d (patch) | |
| tree | 7a04fc87318d5008bbc1f1ac145ebb505bb5238c /app/openssl/crypto/rand/rand_lib.c | |
| parent | 56fe0400b8983ce57112ed5a0f993985a87741c0 (diff) | |
| parent | 33c5958a18599267820f73b151d8161d83f93d88 (diff) | |
Merge branch 'research/Test-on-Android-5-#6543' into develop
Diffstat (limited to 'app/openssl/crypto/rand/rand_lib.c')
| -rw-r--r-- | app/openssl/crypto/rand/rand_lib.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/app/openssl/crypto/rand/rand_lib.c b/app/openssl/crypto/rand/rand_lib.c index 5ac0e14c..239a1cde 100644 --- a/app/openssl/crypto/rand/rand_lib.c +++ b/app/openssl/crypto/rand/rand_lib.c @@ -68,6 +68,7 @@  #ifdef OPENSSL_FIPS  #include <openssl/fips.h>  #include <openssl/fips_rand.h> +#include "rand_lcl.h"  #endif  #ifndef OPENSSL_NO_ENGINE @@ -199,7 +200,7 @@ static size_t drbg_get_entropy(DRBG_CTX *ctx, unsigned char **pout,  	*pout = OPENSSL_malloc(min_len);  	if (!*pout)  		return 0; -	if (RAND_SSLeay()->bytes(*pout, min_len) <= 0) +	if (ssleay_rand_bytes(*pout, min_len, 0, 0) <= 0)  		{  		OPENSSL_free(*pout);  		*pout = NULL;  | 
