upstream OpenBSD: arc4random: Remove unused ivbits argument from chacha_keysetup

to match other instances in the tree. ok deraadt@
This commit is contained in:
dtucker 2022-02-28 21:56:29 +00:00 committed by Corinna Vinschen
parent db5e07368c
commit f5fece2838
2 changed files with 4 additions and 4 deletions

View File

@ -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> * Copyright (c) 1996, David Mazieres <dm@uun.org>
@ -78,7 +78,7 @@ _rs_init(u_char *buf, size_t n)
_exit(1); _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); chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ);
} }

View File

@ -4,7 +4,7 @@ D. J. Bernstein
Public domain. 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> #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 const char tau[16] = "expand 16-byte k";
static void 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; const char *constants;