static int trivial_quick(rand_pool *r) { return (-1); }
-#if __GNUC__ && (CPUFAM_X86 || CPUFAM_AMD64)
-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);
-}
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern int rand_quick_x86ish_rdrand(rand_pool */*r*/);
#endif
static quick__functype *pick_quick(void)
{
-#if __GNUC__ && (CPUFAM_X86 || CPUFAM_AMD64)
- DISPATCH_PICK_COND(rand_quick, rdrand_quick,
+#if CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(rand_quick, rand_quick_x86ish_rdrand,
cpu_feature_p(CPUFEAT_X86_RDRAND));
#endif
DISPATCH_PICK_FALLBACK(rand_quick, trivial_quick);
const octet *c = p;
int i, rot;
-#if RAND_POOLSZ != 128
-# error Polynomial in rand_add is out of date. Fix it.
-#endif
+ STATIC_ASSERT(RAND_POOLSZ == 128, "Polynomial doesn't match pool size");
RAND_RESOLVE(r);
HASH_CTX hc;
CIPHER_CTX cc;
+ STATIC_ASSERT(CIPHER_KEYSZ <= HASH_SZ, "rand cipher keysize too long");
+
RAND_RESOLVE(r);
QUICK(r);
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);
/* --- Now mangle all of the data based on the hash --- */
- assert(CIPHER_KEYSZ <= HASH_SZ);
CIPHER_INIT(&cc, h, CIPHER_KEYSZ, 0);
CIPHER_ENCRYPT(&cc, r->pool, r->pool, RAND_POOLSZ);
CIPHER_ENCRYPT(&cc, r->buf, r->buf, RAND_BUFSZ);
HASH_CTX hc;
CIPHER_CTX cc;
+ STATIC_ASSERT(CIPHER_KEYSZ <= HASH_SZ, "rand cipher keysize too long");
+
RAND_RESOLVE(r);
QUICK(r);
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);
/* --- Now mangle the buffer based on the hash --- */
- assert(CIPHER_KEYSZ <= HASH_SZ);
CIPHER_INIT(&cc, h, CIPHER_KEYSZ, 0);
CIPHER_ENCRYPT(&cc, r->buf, r->buf, RAND_BUFSZ);
BURN(cc);