#include <mLib/sub.h>
#include "arena.h"
-#include "blowfish-cbc.h"
#include "paranoia.h"
+
+#define RAND__HACKS
#include "rand.h"
-#include "rmd160.h"
-#include "rmd160-hmac.h"
+
+#include "noise.h"
+
+#include "twofish-counter.h"
+#include "sha256.h"
+
+#define CIPHER_CTX twofish_counterctx
+#define CIPHER_INIT twofish_counterinit
+#define CIPHER_ENCRYPT twofish_counterencrypt
+#define CIPHER_IVSZ TWOFISH_BLKSZ
+#define CIPHER_KEYSZ TWOFISH_KEYSZ
+
+#define HASH_CTX sha256_ctx
+#define HASH_INIT sha256_init
+#define HASH sha256_hash
+#define HASH_DONE sha256_done
+#define HASH_SZ SHA256_HASHSZ
/*----- Static variables --------------------------------------------------*/
static const grand_ops gops;
-typedef struct gctx {
+typedef struct rand__gctx {
grand r;
rand_pool p;
} gctx;
-static gctx *pool = 0; /* Default random pool */
+gctx rand_global = {
+ { &gops },
+ { { 0 }, 0, 0, 0,
+ { 0 }, RAND_SECSZ, 0,
+ { "Catacomb global random byte pool" },
+ &noise_source }
+};
/*----- Macros ------------------------------------------------------------*/
-#define RAND_RESOLVE(r) do { \
- if ((r) == RAND_GLOBAL) { \
- if (!pool) \
- pool = (gctx *)rand_create(); \
- (r) = &pool->p; \
- } \
-} while (0)
+#define RAND_RESOLVE(r) \
+ do { if ((r) == RAND_GLOBAL) r = &rand_global.p; } while (0)
#define TIMER(r) do { \
if ((r)->s && (r)->s->timer) \
r->irot = 0;
r->ibits = r->obits = 0;
r->o = RAND_SECSZ;
- r->s = 0;
- rmd160_hmacinit(&r->k, 0, 0);
+ r->s = &noise_source;
+ rand_key(r, 0, 0);
rand_gate(r);
}
void rand_key(rand_pool *r, const void *k, size_t sz)
{
+ HASH_CTX hc;
+ octet h[HASH_SZ];
+ static const char label[] = "Catacomb random pool key";
+
RAND_RESOLVE(r);
- rmd160_hmacinit(&r->k, k, sz);
+
+ assert(HASH_SZ >= RAND_KEYSZ);
+ HASH_INIT(&hc);
+ HASH(&hc, label, sizeof(label));
+ if (sz) HASH(&hc, k, sz);
+ HASH_DONE(&hc, h);
+ memcpy(r->k.k, h, RAND_KEYSZ);
}
/* --- @rand_add@ --- *
void rand_gate(rand_pool *r)
{
- octet mac[RMD160_HASHSZ];
+ octet h[HASH_SZ];
+ HASH_CTX hc;
+ CIPHER_CTX cc;
RAND_RESOLVE(r);
TIMER(r);
/* --- Hash up all the data in the pool --- */
- {
- rmd160_macctx mc;
-
- rmd160_macinit(&mc, &r->k);
- rmd160_machash(&mc, r->pool, sizeof(r->pool));
- rmd160_machash(&mc, r->buf, sizeof(r->buf));
- rmd160_macdone(&mc, mac);
- BURN(mc);
- }
+ HASH_INIT(&hc);
+ HASH(&hc, r->pool, RAND_POOLSZ);
+ HASH(&hc, r->buf, RAND_BUFSZ);
+ HASH_DONE(&hc, h);
+ BURN(hc);
/* --- Now mangle all of the data based on the hash --- */
- {
- blowfish_cbcctx bc;
-
- blowfish_cbcinit(&bc, mac, sizeof(mac), 0);
- blowfish_cbcencrypt(&bc, r->pool, r->pool, sizeof(r->pool));
- blowfish_cbcencrypt(&bc, r->buf, r->buf, sizeof(r->buf));
- BURN(bc);
- }
+ 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);
+ BURN(cc);
/* --- Reset the various state variables --- */
void rand_stretch(rand_pool *r)
{
- octet mac[RMD160_HASHSZ];
+ octet h[HASH_SZ];
+ HASH_CTX hc;
+ CIPHER_CTX cc;
RAND_RESOLVE(r);
TIMER(r);
/* --- Hash up all the data in the buffer --- */
- {
- rmd160_macctx mc;
-
- rmd160_macinit(&mc, &r->k);
- rmd160_machash(&mc, r->pool, sizeof(r->pool));
- rmd160_machash(&mc, r->buf, sizeof(r->buf));
- rmd160_macdone(&mc, mac);
- BURN(mc);
- }
-
- /* --- Now mangle the buffer based on that hash --- */
+ HASH_INIT(&hc);
+ HASH(&hc, r->pool, RAND_POOLSZ);
+ HASH(&hc, r->buf, RAND_BUFSZ);
+ HASH_DONE(&hc, h);
+ BURN(hc);
- {
- blowfish_cbcctx bc;
+ /* --- Now mangle the buffer based on the hash --- */
- blowfish_cbcinit(&bc, mac, sizeof(mac), 0);
- blowfish_cbcencrypt(&bc, r->buf, r->buf, sizeof(r->buf));
- BURN(bc);
- }
+ assert(CIPHER_KEYSZ < HASH_SZ);
+ CIPHER_INIT(&cc, h, CIPHER_KEYSZ, 0);
+ CIPHER_ENCRYPT(&cc, r->buf, r->buf, RAND_BUFSZ);
+ BURN(cc);
/* --- Reset the various state variables --- */
/*----- Generic random number generator interface -------------------------*/
-#define GRESOLVE(g, r) do { \
- if (r != &rand_global) \
- g = (gctx *)r; \
- else { \
- if (!pool) \
- pool = (gctx *)rand_create(); \
- g = pool; \
- } \
-} while (0)
-
static void gdestroy(grand *r)
{
- gctx *g;
- GRESOLVE(g, r);
- if (g != pool) {
+ gctx *g = (gctx *)r;
+ if (g != &rand_global) {
BURN(*g);
S_DESTROY(g);
}
static int gmisc(grand *r, unsigned op, ...)
{
- gctx *g;
+ gctx *g = (gctx *)r;
va_list ap;
int rc = 0;
va_start(ap, op);
- GRESOLVE(g, r);
switch (op) {
case GRAND_CHECK:
switch (va_arg(ap, unsigned)) {
static octet gbyte(grand *r)
{
- gctx *g;
+ gctx *g = (gctx *)r;
octet o;
- GRESOLVE(g, r);
rand_getgood(&g->p, &o, 1);
return (o);
}
static uint32 gword(grand *r)
{
- gctx *g;
+ gctx *g = (gctx *)r;
octet b[4];
- GRESOLVE(g, r);
rand_getgood(&g->p, &b, sizeof(b));
return (LOAD32(b));
}
static void gfill(grand *r, void *p, size_t sz)
{
- gctx *g;
- GRESOLVE(g, r);
+ gctx *g = (gctx *)r;
rand_get(&g->p, p, sz);
}
gword, gbyte, gword, grand_range, gfill
};
-grand rand_global = { &gops };
-
/* --- @rand_create@ --- *
*
* Arguments: ---
~mdw / catacomb / blobdiff