diff options
author | dtucker <> | 2022-02-28 21:56:29 +0000 |
---|---|---|
committer | dtucker <> | 2022-02-28 21:56:29 +0000 |
commit | 4d809bb98b2046d02a7447203478b3d9d0846702 (patch) | |
tree | 1f00ae7c9820f1d4135b839a56478c8e8ba3a1b4 | |
parent | e7a4c5c29f0809ffb65ae98c57b691e57987c9db (diff) | |
download | openbsd-4d809bb98b2046d02a7447203478b3d9d0846702.tar.gz openbsd-4d809bb98b2046d02a7447203478b3d9d0846702.tar.bz2 openbsd-4d809bb98b2046d02a7447203478b3d9d0846702.zip |
Remove unused ivbits argument from chacha_keysetup to match other
instances in the tree. ok deraadt@
-rw-r--r-- | src/lib/libc/crypt/arc4random.c | 4 | ||||
-rw-r--r-- | src/lib/libc/crypt/chacha_private.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c index 1a16bd3940..6cbab6e79b 100644 --- a/src/lib/libc/crypt/arc4random.c +++ b/src/lib/libc/crypt/arc4random.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: arc4random.c,v 1.55 2019/03/24 17:56:54 deraadt Exp $ */ | 1 | /* $OpenBSD: arc4random.c,v 1.56 2022/02/28 21:56:29 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1996, David Mazieres <dm@uun.org> | 4 | * Copyright (c) 1996, David Mazieres <dm@uun.org> |
@@ -78,7 +78,7 @@ _rs_init(u_char *buf, size_t n) | |||
78 | _exit(1); | 78 | _exit(1); |
79 | } | 79 | } |
80 | 80 | ||
81 | chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8, 0); | 81 | chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8); |
82 | chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ); | 82 | chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ); |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/src/lib/libc/crypt/chacha_private.h b/src/lib/libc/crypt/chacha_private.h index 7c3680fa6d..b0427b6b3e 100644 --- a/src/lib/libc/crypt/chacha_private.h +++ b/src/lib/libc/crypt/chacha_private.h | |||
@@ -4,7 +4,7 @@ D. J. Bernstein | |||
4 | Public domain. | 4 | Public domain. |
5 | */ | 5 | */ |
6 | 6 | ||
7 | /* $OpenBSD: chacha_private.h,v 1.2 2013/10/04 07:02:27 djm Exp $ */ | 7 | /* $OpenBSD: chacha_private.h,v 1.3 2022/02/28 21:56:29 dtucker Exp $ */ |
8 | 8 | ||
9 | typedef unsigned char u8; | 9 | typedef unsigned char u8; |
10 | typedef unsigned int u32; | 10 | typedef unsigned int u32; |
@@ -52,7 +52,7 @@ static const char sigma[16] = "expand 32-byte k"; | |||
52 | static const char tau[16] = "expand 16-byte k"; | 52 | static const char tau[16] = "expand 16-byte k"; |
53 | 53 | ||
54 | static void | 54 | static void |
55 | chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits,u32 ivbits) | 55 | chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits) |
56 | { | 56 | { |
57 | const char *constants; | 57 | const char *constants; |
58 | 58 | ||