[newlib-cygwin] upstream OpenBSD: arc4random: Remove unused ivbits argument from chacha_keysetup

[newlib-cygwin] upstream OpenBSD: arc4random: Remove unused ivbits argument from chacha_keysetup

[Corinna Vinschen]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f5fece283864fcfe7c690d4e7c1032b616e5d570

commit f5fece283864fcfe7c690d4e7c1032b616e5d570
Author: dtucker <dtucker@openbsd.org>
Date:   Mon Feb 28 21:56:29 2022 +0000

    upstream OpenBSD: arc4random: Remove unused ivbits argument from chacha_keysetup
    
    to match other instances in the tree. ok deraadt@

Diff:
---
 newlib/libc/stdlib/arc4random.c     | 4 ++--
 newlib/libc/stdlib/chacha_private.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/newlib/libc/stdlib/arc4random.c b/newlib/libc/stdlib/arc4random.c
index 8bb7a6671..c394f984a 100644
--- a/newlib/libc/stdlib/arc4random.c
+++ b/newlib/libc/stdlib/arc4random.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc4random.c,v 1.55 2019/03/24 17:56:54 deraadt Exp $	*/
+/*	$OpenBSD: arc4random.c,v 1.56 2022/02/28 21:56:29 dtucker Exp $	*/
 
 /*
  * Copyright (c) 1996, David Mazieres <dm@uun.org>
@@ -78,7 +78,7 @@ _rs_init(u_char *buf, size_t n)
 			_exit(1);
 	}
 
-	chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8, 0);
+	chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8);
 	chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ);
 }
 
diff --git a/newlib/libc/stdlib/chacha_private.h b/newlib/libc/stdlib/chacha_private.h
index 0a3e38c10..2ecf10bbb 100644
--- a/newlib/libc/stdlib/chacha_private.h
+++ b/newlib/libc/stdlib/chacha_private.h
@@ -4,7 +4,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 $ */
 
 #include <stdint.h>
 
@@ -51,7 +51,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;