progs/cc-kem.c: Add `naclbox' crypto transform.

[catacomb] / symm / chacha.c

diff --git a/symm/chacha.c b/symm/chacha.c
index cb879e3..43d23dc 100644 (file)
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -62,11 +62,9 @@ const octet chacha_keysz[] = { KSZ_SET, 32, 16, 10, 0 };
  *             the feedforward step.
  */
 
-CPU_DISPATCH(static, (void),
-            void, core, (unsigned r, const chacha_matrix src,
-                         chacha_matrix dest),
-            (r, src, dest),
-            pick_core, simple_core);
+CPU_DISPATCH(static, (void), void, core,
+            (unsigned r, const chacha_matrix src, chacha_matrix dest),
+            (r, src, dest), pick_core, simple_core);
 
 static void simple_core(unsigned r, const chacha_matrix src,
                        chacha_matrix dest)
@@ -220,9 +218,9 @@ unsigned long chacha_tell(chacha_ctx *ctx)
   { kludge64 i = chacha_tellu64(ctx); return (GET64(unsigned long, i)); }
 
 kludge64 chacha_tellu64(chacha_ctx *ctx)
-  { kludge64 i; SET64(i, ctx->a[9], ctx->a[8]); return (i); }
+  { kludge64 i; SET64(i, ctx->a[13], ctx->a[12]); return (i); }
 
-/* --- @chacha{,12,8}_encrypt@ --- *
+/* --- @chacha{20,12,8}_encrypt@ --- *
  *
  * Arguments:  @chacha_ctx *ctx@ = pointer to context
  *             @const void *src@ = source buffer (or null)
@@ -446,7 +444,7 @@ CHACHA_VARS(DEFXNONCE)
  *             different.
  */
 
-/* --- @xchacha{,12,8}_encrypt@ --- *
+/* --- @xchacha{20,12,8}_encrypt@ --- *
  *
  * Arguments:  @xchachaR_ctx *ctx@ = pointer to context
  *             @const void *src@ = source buffer (or null)
@@ -708,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);                                   \
@@ -750,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);                              \