static int rdrand_quick(rand_pool *r)
{
unsigned long rr;
- unsigned char w;
- int i;
-
- for (i = 0; i < 16; i++) {
- __asm__ ("rdrand %0; setc %1" : "=r" (rr), "=g" (w) : : "cc");
- if (w) {
- rand_add(r, &rr, sizeof(rr), 8*sizeof(rr));
- return (0);
- }
- }
- return (-1);
+ int i = 16;
+
+ __asm__ ("0: rdrand %0; jc 9f; dec %1; jnz 0b; 9:"
+ : "=r" (rr), "=r" (i) : "1" (i) : "cc");
+ if (!i) return (-1);
+ rand_add(r, &rr, sizeof(rr), 8*sizeof(rr));
+ return (0);
}
#endif
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_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);