From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 14 Apr 2017 22:27:50 +0000 (+0100)
Subject: Merge branch '2.3.x'
X-Git-Tag: 2.4.0~61
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/91f56a78e497b97c996cc46c7e7aff487a0b68bd?hp=57e7040b318f0ffc5ab43c3fb62df9a2bef42ac7

Merge branch '2.3.x'

* 2.3.x:
  symm/salsa20.[ch]: Add missing LGPL notices.
  math/mpx-mul4-test.c: Set `dstr' length correctly in conversion function.
  symm/chacha.c: Fix `tell' response.
  symm/chacha.[ch]: Fix comment headers.
  symm/{chacha.c,salsa20.c}: Fix random generator allocation sizes.
---

diff --git a/symm/chacha.c b/symm/chacha.c
index abcc1bd4..43d23dc7 100644
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -218,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)
@@ -444,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)
@@ -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/chacha.h b/symm/chacha.h
index f46eab96..419b19a4 100644
--- a/symm/chacha.h
+++ b/symm/chacha.h
@@ -315,7 +315,7 @@ const gccipher xchacha20, xchacha12, xchacha8;
 
 /*----- Generic random number generator interface -------------------------*/
 
-/* --- @chacha{,12,8}_rand@, @xchacha{,12,8}_rand@ --- *
+/* --- @chacha{20,12,8}_rand@, @xchacha{20,12,8}_rand@ --- *
  *
  * Arguments:		@const void *k@ = pointer to key material
  *			@size_t ksz@ = size of key material
diff --git a/symm/salsa20.c b/symm/salsa20.c
index 29a43f0e..3465ad9a 100644
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -5,6 +5,26 @@
  * (c) 2015 Straylight/Edgeware
  */
 
+/*----- Licensing notice --------------------------------------------------*
+ *
+ * This file is part of Catacomb.
+ *
+ * Catacomb is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Catacomb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with Catacomb; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -707,7 +727,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 +770,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);				\
diff --git a/symm/salsa20.h b/symm/salsa20.h
index 4a0d1ebf..0259172b 100644
--- a/symm/salsa20.h
+++ b/symm/salsa20.h
@@ -5,6 +5,26 @@
  * (c) 2015 Straylight/Edgeware
  */
 
+/*----- Licensing notice --------------------------------------------------*
+ *
+ * This file is part of Catacomb.
+ *
+ * Catacomb is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Catacomb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with Catacomb; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
 #ifndef CATACOMB_SALSA20_H
 #define CATACOMB_SALSA20_H