From f9fe99103a13da2d40aac5bd047297096807747f Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Thu, 13 Apr 2017 14:47:11 +0100 Subject: [PATCH] symm/{chacha.c,salsa20.c}: Fix random generator allocation sizes. This makes a real mess. --- symm/chacha.c | 4 ++-- symm/salsa20.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/symm/chacha.c b/symm/chacha.c index abcc1bd4..4dcfcef9 100644 --- a/symm/chacha.c +++ b/symm/chacha.c @@ -706,7 +706,7 @@ static void grdestroy(grand *r) \ grand *chacha##rr##_rand(const void *k, size_t ksz, const void *n) \ { \ - grctx *g = S_CREATE(g); \ + grctx *g = S_CREATE(grctx); \ g->r.r.ops = &grops_rand_##rr; \ g->r.ops = &grops_##rr; \ chacha_init(&g->ctx, k, ksz, n); \ @@ -748,7 +748,7 @@ CHACHA_VARS(DEFGRAND) \ grand *xchacha##rr##_rand(const void *k, size_t ksz, const void *n) \ { \ - grxctx_##rr *g = S_CREATE(g); \ + grxctx_##rr *g = S_CREATE(grxctx_##rr); \ g->r.r.ops = &grxops_rand_##rr; \ g->r.ops = &grxops_##rr; \ XCHACHA_INIT(rr, &g->ctx, k, ksz, n); \ diff --git a/symm/salsa20.c b/symm/salsa20.c index 29a43f0e..92631b1d 100644 --- a/symm/salsa20.c +++ b/symm/salsa20.c @@ -707,7 +707,7 @@ static void grdestroy(grand *r) grand *SALSA20_DECOR(salsa20, rr, _rand) \ (const void *k, size_t ksz, const void *n) \ { \ - grctx *g = S_CREATE(g); \ + grctx *g = S_CREATE(grctx); \ g->r.r.ops = &grops_rand_##rr; \ g->r.ops = &grops_##rr; \ salsa20_init(&g->ctx, k, ksz, n); \ @@ -750,7 +750,7 @@ SALSA20_VARS(DEFGRAND) grand *SALSA20_DECOR(xsalsa20, rr, _rand) \ (const void *k, size_t ksz, const void *n) \ { \ - grxctx_##rr *g = S_CREATE(g); \ + grxctx_##rr *g = S_CREATE(grxctx_##rr); \ g->r.r.ops = &grxops_rand_##rr; \ g->r.ops = &grxops_##rr; \ XSALSA20_INIT(rr, &g->ctx, k, ksz, n); \ -- 2.11.0