From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 28 Feb 2022 22:02:06 +0000 (+1100)
Subject: Remove unused ivbits argument from chacha_keysetup
X-Git-Tag: V_9_0_P1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f117cb151efe138ac57bdd8e26165f350328f5f;p=thirdparty%2Fopenssh-portable.git

Remove unused ivbits argument from chacha_keysetup
---

diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c
index 80ff3c180..ce5f054f1 100644
--- 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 2e5c8c1da..cdcb78560 100644
--- 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;