www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Consensus is that we should not use the scoreboard as a source of entropy.

Browse Source 
Reviewed by: OtherBill, Justin, Madhu


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93652 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Cliff Woolley
2002-03-01 04:35:17 +00:00
parent 317cd14108
commit 8097066e90
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/ssl/mod_ssl.h
View File

@@ -515,7 +515,6 @@ typedef struct {
char *szMutexFile; char *szMutexFile;
apr_lock_t *pMutex; apr_lock_t *pMutex;
apr_array_header_t *aRandSeed; apr_array_header_t *aRandSeed;
int nScoreboardSize; /* used for builtin random seed */
apr_hash_t *tVHostKeys; apr_hash_t *tVHostKeys;
apr_hash_t *tTmpKeys; apr_hash_t *tTmpKeys;
void *pTmpKeys[SSL_TKPIDX_MAX]; void *pTmpKeys[SSL_TKPIDX_MAX];

4
modules/ssl/ssl_engine_init.c
View File

@@ -163,11 +163,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
/* /*
* Seed the Pseudo Random Number Generator (PRNG) * Seed the Pseudo Random Number Generator (PRNG)
*
* Note: scoreboard size must be fetched at init time because
* ap_calc_scoreboard_size() is not threadsafe
*/ */
mc->nScoreboardSize = ap_calc_scoreboard_size();
ssl_rand_seed(s, p, SSL_RSCTX_STARTUP, "Init: "); ssl_rand_seed(s, p, SSL_RSCTX_STARTUP, "Init: ");
/* /*

16
modules/ssl/ssl_engine_rand.c
View File

@@ -81,7 +81,6 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
int nReq, nDone; int nReq, nDone;
apr_file_t *fp; apr_file_t *fp;
int i, n, l; int i, n, l;
int m;
mc = myModConfig(s); mc = myModConfig(s);
nReq = 0; nReq = 0;
@@ -155,21 +154,6 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
RAND_seed(stackdata+n, 128); RAND_seed(stackdata+n, 128);
nDone += 128; nDone += 128;
/*
* seed in data extracted from the current scoreboard
*
* XXX: this assumes that the entire scoreboard is
* allocated in one big block of memory that begins at
* the location pointed to by ap_scoreboard_image->global
*/
if (ap_scoreboard_image != NULL && mc->nScoreboardSize > 16)
{
m = ((mc->nScoreboardSize / 2) - 1);
n = ssl_rand_choosenum(0, m);
RAND_seed(
((unsigned char *)ap_scoreboard_image->global)+n, m);
nDone += m;
}
} }
} }
} }