From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 30 Sep 2017 01:43:47 +0000 (+0100)
Subject: symm/{salsa20,chacha}.c (..._rand): Don't crash if nonce pointer is null.
X-Git-Tag: 2.4.2~22
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/c2603631178b688a6f8ce5eccd461e74718058d5?hp=e057fe08fc130c9a84c0d5ae885580286837b2d3

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 655ecd02..2dcb1253 100644
--- 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 15285985..ff6efe39 100644
--- 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);
 }