#if CPUFAM_X86 || CPUFAM_AMD64
extern int rand_quick_x86ish_rdrand(rand_pool */*r*/);
+extern int rand_quick_x86ish_rdseed(rand_pool */*r*/);
#endif
static quick__functype *pick_quick(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(rand_quick, rand_quick_x86ish_rdseed,
+ cpu_feature_p(CPUFEAT_X86_RDSEED));
DISPATCH_PICK_COND(rand_quick, rand_quick_x86ish_rdrand,
cpu_feature_p(CPUFEAT_X86_RDRAND));
#endif
r->o = RAND_SECSZ;
r->obits += r->ibits;
if (r->obits > RAND_OBITS) {
- r->ibits = r->obits - r->ibits;
+ r->ibits = r->obits - RAND_OBITS;
r->obits = RAND_OBITS;
} else
r->ibits = 0;
if (!sz)
return;
for (;;) {
- if (r->o + sz <= RAND_BUFSZ) {
+ if (sz <= RAND_BUFSZ - r->o) {
memcpy(o, r->buf + r->o, sz);
r->o += sz;
break;
}
}
- if (r->obits > sz * 8)
- r->obits -= sz * 8;
+ if (r->obits > 8*sz)
+ r->obits -= 8*sz;
else
r->obits = 0;
}
while (sz) {
size_t chunk = sz;
- if (chunk * 8 > r->obits) {
- if (chunk * 8 > r->ibits + r->obits)
+ if (8*chunk > r->obits) {
+ if (8*chunk > r->ibits + r->obits)
do r->s->getnoise(r); while (r->ibits + r->obits < 256);
rand_gate(r);
- if (chunk * 8 > r->obits)
- chunk = r->obits / 8;
+ if (8*chunk > r->obits)
+ chunk = r->obits/8;
}
- if (chunk + r->o > RAND_BUFSZ)
+ if (chunk <= RAND_BUFSZ - r->o) {
+ memcpy(o, r->buf + r->o, chunk);
+ r->o += chunk;
+ } else {
chunk = RAND_BUFSZ - r->o;
+ memcpy(o, r->buf + r->o, chunk);
+ rand_stretch(r);
+ }
- memcpy(o, r->buf + r->o, chunk);
- r->o += chunk;
- r->obits -= chunk * 8;
+ r->obits -= 8*chunk;
o += chunk;
sz -= chunk;
}