projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now that PuTTY is actually using names "@putty.projects.tartarus.org", it
[u/mdw/putty]
/
sshrand.c
diff --git
a/sshrand.c
b/sshrand.c
index
43b8123
..
26fcfe5
100644
(file)
--- a/
sshrand.c
+++ b/
sshrand.c
@@
-40,6
+40,8
@@
struct RandPool {
unsigned char incomingb[HASHINPUT];
int incomingpos;
unsigned char incomingb[HASHINPUT];
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)];
int i, j, k;
word32 digest[HASHSIZE / sizeof(word32)];
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);
SHATransform((word32 *) pool.incoming, (word32 *) pool.incomingb);
noise_get_light(random_add_noise);
SHATransform((word32 *) pool.incoming, (word32 *) pool.incomingb);
@@
-115,6
+125,8
@@
static void random_stir(void)
memcpy(pool.incoming, digest, sizeof(digest));
pool.poolpos = sizeof(pool.incoming);
memcpy(pool.incoming, digest, sizeof(digest));
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)