symm/{salsa20,chacha}.c (..._rand): Don't crash if nonce pointer is null.

Oops.

diff --git a/symm/chacha.c b/symm/chacha.c
index 655ecd02417139b1ff1d15adf4f2824e64e8c711..2dcb125395ea70328c00976906e94543ec145c89 100644 (file)
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -747,7 +747,7 @@ static grand *grinit(const void *k, size_t ksz, const void *n,
     g->r.r.ops = ops;
     g->r.ops = myops;
     chacha_init(&g->ctx, k, ksz, 0);
-    myops->setnonce(g, n);
+    if (n) myops->setnonce(g, n);
     return (&g->r.r);
 }
 

diff --git a/symm/salsa20.c b/symm/salsa20.c
index 15285985a3d7c1a3fbfa3e2d9254d05a62d61c25..ff6efe39ddbcc66691e82b9f1ab01abefae44159 100644 (file)
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -767,7 +767,7 @@ static grand *grinit(const void *k, size_t ksz, const void *n,
     g->r.r.ops = ops;
     g->r.ops = myops;
     salsa20_init(&g->ctx, k, ksz, 0);
-    myops->setnonce(g, n);
+    if (n) myops->setnonce(g, n);
     return (&g->r.r);
 }