From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 7FE8A3857023; Sat, 10 Sep 2022 19:01:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7FE8A3857023 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1662836505; bh=Lfj9dLwfMReclCXaZ0ekxkvPMJ8IBYu0GuiynsS2nP8=; h=From:To:Subject:Date:From; b=Pd9sSqp+Lc0holHHFjS1mkKd8jCNlo4NLrOqWV9xO10H/Ht6kaH024DVtVfj5dEmK GegpUo2JcbxrOMtW6sNUjXqYNBW4QhPLftbND1WNH6JMUP2d3l4EpusZpixk30alQR /lbTMaYAt5KwoljN6EdCfiNdXvzYsxL9BhbbsLRU= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] upstream OpenBSD: arc4random: Remove unused ivbits argument from chacha_keysetup X-Act-Checkin: newlib-cygwin X-Git-Author: dtucker X-Git-Refname: refs/heads/master X-Git-Oldrev: db5e07368c10fb6c362343d94775ab0a3248d0e7 X-Git-Newrev: f5fece283864fcfe7c690d4e7c1032b616e5d570 Message-Id: <20220910190145.7FE8A3857023@sourceware.org> Date: Sat, 10 Sep 2022 19:01:45 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Df5fece28386= 4fcfe7c690d4e7c1032b616e5d570 commit f5fece283864fcfe7c690d4e7c1032b616e5d570 Author: dtucker Date: Mon Feb 28 21:56:29 2022 +0000 upstream OpenBSD: arc4random: Remove unused ivbits argument from chacha= _keysetup =20 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/arc4rando= m.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 $ */ =20 /* * Copyright (c) 1996, David Mazieres @@ -78,7 +78,7 @@ _rs_init(u_char *buf, size_t n) _exit(1); } =20 - chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8, 0); + chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8); chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ); } =20 diff --git a/newlib/libc/stdlib/chacha_private.h b/newlib/libc/stdlib/chach= a_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. */ =20 -/* $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 $ */ =20 #include =20 @@ -51,7 +51,7 @@ static const char sigma[16] =3D "expand 32-byte k"; static const char tau[16] =3D "expand 16-byte k"; =20 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;