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);
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;
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);
chunk = r->obits / 8;
}
- if (chunk + r->o > RAND_BUFSZ)
+ if (chunk + r->o <= RAND_BUFSZ) {
+ 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;
o += chunk;
sz -= chunk;