From 822b16c6923dd059abd30b78d1a8bed507a90bf3 Mon Sep 17 00:00:00 2001 From: dtucker Date: Mon, 28 Feb 2022 21:56:29 +0000 Subject: [PATCH] Remove unused ivbits argument from chacha_keysetup to match other instances in the tree. ok deraadt@ --- lib/libc/crypt/arc4random.c | 4 ++-- lib/libc/crypt/chacha_private.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/crypt/arc4random.c b/lib/libc/crypt/arc4random.c index 1a16bd3940b..6cbab6e79bc 100644 --- a/lib/libc/crypt/arc4random.c +++ b/lib/libc/crypt/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 @@ -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/lib/libc/crypt/chacha_private.h b/lib/libc/crypt/chacha_private.h index 7c3680fa6d6..b0427b6b3e8 100644 --- a/lib/libc/crypt/chacha_private.h +++ b/lib/libc/crypt/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 $ */ typedef unsigned char u8; typedef unsigned int u32; @@ -52,7 +52,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; -- 2.20.1