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

Curl_rand: Use a fake entropy for debug builds when CURL_ENTROPY set

Browse Source
This commit is contained in:
Steve Holme 2014-06-08 20:33:29 +01:00
parent bde0d89c3d
commit 51bb067a42
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vtls/vtls.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -197,6 +197,23 @@ unsigned int Curl_rand(struct SessionHandle *data)
static unsigned int randseed; static unsigned int randseed;
static bool seeded = FALSE; static bool seeded = FALSE;
#ifdef CURLDEBUG
char *force_entropy = getenv("CURL_ENTROPY");
if(force_entropy) {
if(!seeded) {
size_t elen = strlen(force_entropy);
size_t clen = sizeof(randseed);
size_t min = elen < clen ? elen : clen;
memcpy((char *)&randseed, force_entropy, min);
seeded = TRUE;
}
else
randseed++;
return randseed;
}
#endif
#ifndef have_curlssl_random #ifndef have_curlssl_random
(void)data; (void)data;
#else #else

1
tests/runtests.pl
View File

@ -311,6 +311,7 @@ if (!$USER) {
# enable memory debugging if curl is compiled with it # enable memory debugging if curl is compiled with it
$ENV{'CURL_MEMDEBUG'} = $memdump; $ENV{'CURL_MEMDEBUG'} = $memdump;
$ENV{'CURL_ENTROPY'}="12345678";
$ENV{'HOME'}=$pwd; $ENV{'HOME'}=$pwd;
sub catch_zap { sub catch_zap {