Remove unused ivbits argument from chacha_keysetup

diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c
index 80ff3c1801a121d3fb66776fec214bd33cab715f..ce5f054f1e2353239206972594943b4b6ba68039 100644 (file)
--- a/openbsd-compat/arc4random.c
+++ b/openbsd-compat/arc4random.c
@@ -79,7 +79,7 @@ _rs_init(u_char *buf, size_t n)
 {
        if (n < KEYSZ + IVSZ)
                return;
-       chacha_keysetup(&rs, buf, KEYSZ * 8, 0);
+       chacha_keysetup(&rs, buf, KEYSZ * 8);
        chacha_ivsetup(&rs, buf + KEYSZ);
 }
 

diff --git a/openbsd-compat/chacha_private.h b/openbsd-compat/chacha_private.h
index 2e5c8c1da810347884331772db03cf115ae20bbf..cdcb785608254d80bdf2c59dea05b251982ff358 100644 (file)
--- a/openbsd-compat/chacha_private.h
+++ b/openbsd-compat/chacha_private.h
@@ -6,7 +6,7 @@ D. J. Bernstein
 Public domain.
 */
 
-/* $OpenBSD: chacha_private.h,v 1.2 2013/10/04 07:02:27 djm Exp $ */
+/* $OpenBSD: chacha_private.h,v 1.3 2022/02/28 21:56:29 dtucker Exp $ */
 
 typedef unsigned char u8;
 typedef unsigned int u32;
@@ -54,7 +54,7 @@ static const char sigma[16] = "expand 32-byte k";
 static const char tau[16] = "expand 16-byte k";
 
 static void
-chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits,u32 ivbits)
+chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits)
 {
   const char *constants;