From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 12 Dec 2019 19:11:47 +0000 (+0000)
Subject: rand/rand.c: More dynamic assertions converted to use `STATIC_ASSERT'.
X-Git-Tag: 2.6.0~48
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/2b18034e2e663f9483327c02d2088ceb46c23471

rand/rand.c: More dynamic assertions converted to use `STATIC_ASSERT'.
---

diff --git a/rand/rand.c b/rand/rand.c
index 32605ac0..304c68dc 100644
--- a/rand/rand.c
+++ b/rand/rand.c
@@ -304,6 +304,8 @@ void rand_gate(rand_pool *r)
   HASH_CTX hc;
   CIPHER_CTX cc;
 
+  STATIC_ASSERT(CIPHER_KEYSZ <= HASH_SZ, "rand cipher keysize too long");
+
   RAND_RESOLVE(r);
   QUICK(r);
 
@@ -319,7 +321,6 @@ void rand_gate(rand_pool *r)
 
   /* --- 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);
@@ -355,6 +356,8 @@ void rand_stretch(rand_pool *r)
   HASH_CTX hc;
   CIPHER_CTX cc;
 
+  STATIC_ASSERT(CIPHER_KEYSZ <= HASH_SZ, "rand cipher keysize too long");
+
   RAND_RESOLVE(r);
   QUICK(r);
 
@@ -370,7 +373,6 @@ void rand_stretch(rand_pool *r)
 
   /* --- 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);