summary refs log tree commit diff
path: root/compat
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2022-03-21 17:14:22 -0400
committerJune McEnroe <june@causal.agency>2022-03-21 17:14:22 -0400
commit36e3e016edf8b8068aa7c5e9f188159ee4d4e2fb (patch)
treeabf6a8eda1231cf996ced611c8840384c0b03b81 /compat
parentdoc: Note OpenSSL 3.0.0 compatibility in README (diff)
parentImport LibreSSL 3.5.1 (diff)
downloadlibretls-3.5.1.tar.gz
libretls-3.5.1.zip
Merge LibreSSL 3.5.1 3.5.1
Diffstat (limited to 'compat')
-rw-r--r--compat/arc4random.c4
-rw-r--r--compat/chacha_private.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/compat/arc4random.c b/compat/arc4random.c
index 2bb4dbf..6f95d57 100644
--- a/compat/arc4random.c
+++ b/compat/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/compat/chacha_private.h b/compat/chacha_private.h
index 7c3680f..b0427b6 100644
--- a/compat/chacha_private.h
+++ b/compat/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;