generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mix time into the pool to avoid repetition of the Android duplicated PID problem.

Browse Source
This commit is contained in:
Ben Laurie 2013-09-20 16:52:07 +01:00
parent 7eef2b0cd7
commit 3cd8547a20
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crypto/rand/md_rand.c
View File

@ -120,6 +120,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include "e_os.h" #include "e_os.h"
@ -359,8 +360,12 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
#ifndef GETPID_IS_MEANINGLESS #ifndef GETPID_IS_MEANINGLESS
pid_t curr_pid = getpid(); pid_t curr_pid = getpid();
#endif #endif
time_t curr_time = time(NULL);
struct timeval tv;
int do_stir_pool = 0; int do_stir_pool = 0;
gettimeofday(&tv, NULL);
#ifdef PREDICT #ifdef PREDICT
if (rand_predictable) if (rand_predictable)
{ {
@ -488,11 +493,26 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
#ifndef GETPID_IS_MEANINGLESS #ifndef GETPID_IS_MEANINGLESS
if (curr_pid) /* just in the first iteration to save time */ if (curr_pid) /* just in the first iteration to save time */
{ {
if (!MD_Update(&m,(unsigned char*)&curr_pid,sizeof curr_pid)) if (!MD_Update(&m,(unsigned char*)&curr_pid,
sizeof curr_pid))
goto err; goto err;
curr_pid = 0; curr_pid = 0;
} }
#endif #endif
if (curr_time) /* just in the first iteration to save time */
{
if (!MD_Update(&m,(unsigned char*)&curr_time,
sizeof curr_time))
goto err;
curr_time = 0;
}
if (tv.tv_sec) /* just in the first iteration to save time */
{
if (!MD_Update(&m,(unsigned char*)&tv,
sizeof tv))
goto err;
tv.tv_sec = 0;
}
if (!MD_Update(&m,local_md,MD_DIGEST_LENGTH)) if (!MD_Update(&m,local_md,MD_DIGEST_LENGTH))
goto err; goto err;
if (!MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c))) if (!MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)))