~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base/dispatch.c, etc.: Replace inline assembler for the `rdrand' fix.
[catacomb]
/
rand
/
rand.c
diff --git
a/rand/rand.c
b/rand/rand.c
index
5cca087
..
32605ac
100644
(file)
--- a/
rand/rand.c
+++ b/
rand/rand.c
@@
-311,6
+311,7
@@
void rand_gate(rand_pool *r)
HASH_INIT(&hc);
STORE32(g, r->gen); HASH(&hc, g, sizeof(g));
HASH_INIT(&hc);
STORE32(g, r->gen); HASH(&hc, g, sizeof(g));
+ HASH(&hc, r->k.k, RAND_KEYSZ);
HASH(&hc, r->pool, RAND_POOLSZ);
HASH(&hc, r->buf, RAND_BUFSZ);
HASH_DONE(&hc, h);
HASH(&hc, r->pool, RAND_POOLSZ);
HASH(&hc, r->buf, RAND_BUFSZ);
HASH_DONE(&hc, h);
@@
-361,6
+362,7
@@
void rand_stretch(rand_pool *r)
HASH_INIT(&hc);
STORE32(g, r->gen); HASH(&hc, g, sizeof(g));
HASH_INIT(&hc);
STORE32(g, r->gen); HASH(&hc, g, sizeof(g));
+ HASH(&hc, r->k.k, RAND_KEYSZ);
HASH(&hc, r->pool, RAND_POOLSZ);
HASH(&hc, r->buf, RAND_BUFSZ);
HASH_DONE(&hc, h);
HASH(&hc, r->pool, RAND_POOLSZ);
HASH(&hc, r->buf, RAND_BUFSZ);
HASH_DONE(&hc, h);