nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Owen's just pointed out that random_stir() is capable of recursion.

Browse Source 
I'm sure I didn't mean that to happen! Added a lock to stop it.

[originally from svn r5166]
This commit is contained in:
Simon Tatham 2005-01-22 14:51:29 +00:00
parent 9f8182ffd7
commit 31133eb077
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sshrand.c
View File

@ -40,6 +40,8 @@ struct RandPool {
unsigned char incomingb[HASHINPUT]; unsigned char incomingb[HASHINPUT];
int incomingpos; int incomingpos;
int stir_pending;
}; };
static struct RandPool pool; static struct RandPool pool;
@ -52,6 +54,14 @@ static void random_stir(void)
word32 digest[HASHSIZE / sizeof(word32)]; word32 digest[HASHSIZE / sizeof(word32)];
int i, j, k; int i, j, k;
/*
* noise_get_light will call random_add_noise, which may call
* back to here. Prevent recursive stirs.
*/
if (pool.stir_pending)
return;
pool.stir_pending = TRUE;
noise_get_light(random_add_noise); noise_get_light(random_add_noise);
SHATransform((word32 *) pool.incoming, (word32 *) pool.incomingb); SHATransform((word32 *) pool.incoming, (word32 *) pool.incomingb);
@ -115,6 +125,8 @@ static void random_stir(void)
memcpy(pool.incoming, digest, sizeof(digest)); memcpy(pool.incoming, digest, sizeof(digest));
pool.poolpos = sizeof(pool.incoming); pool.poolpos = sizeof(pool.incoming);
pool.stir_pending = FALSE;
} }
void random_add_noise(void *noise, int length) void random_add_noise(void *noise, int length)