Module Name: src
Committed By: riastradh
Date: Thu Aug 20 21:30:56 UTC 2020
Modified Files:
src/sys/external/isc/libsodium/include: randombytes.h
src/sys/net: if_wg.c
Log Message:
Use cprng_strong, not cprng_fast, for ephemeral key.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/isc/libsodium/include/randombytes.h
cvs rdiff -u -r1.2 -r1.3 src/sys/net/if_wg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/libsodium/include/randombytes.h
diff -u src/sys/external/isc/libsodium/include/randombytes.h:1.1 src/sys/external/isc/libsodium/include/randombytes.h:1.2
--- src/sys/external/isc/libsodium/include/randombytes.h:1.1 Thu Aug 20 21:20:16 2020
+++ src/sys/external/isc/libsodium/include/randombytes.h Thu Aug 20 21:30:56 2020
@@ -1,11 +1,12 @@
/* This overwrites dist/src/libsodium/include/sodium/randombytes.h */
+#include <sys/cprng.h>
+
static inline void
randombytes_buf(void * const buf, const size_t size)
{
- extern size_t cprng_fast(void *, size_t);
- cprng_fast(buf, size);
+ cprng_strong(kern_cprng, buf, size, 0);
}
static inline void
Index: src/sys/net/if_wg.c
diff -u src/sys/net/if_wg.c:1.2 src/sys/net/if_wg.c:1.3
--- src/sys/net/if_wg.c:1.2 Thu Aug 20 21:29:44 2020
+++ src/sys/net/if_wg.c Thu Aug 20 21:30:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wg.c,v 1.2 2020/08/20 21:29:44 riastradh Exp $ */
+/* $NetBSD: if_wg.c,v 1.3 2020/08/20 21:30:56 riastradh Exp $ */
/*
* Copyright (C) Ryota Ozaki <[email protected]>
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.2 2020/08/20 21:29:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.3 2020/08/20 21:30:56 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -813,7 +813,7 @@ wg_algo_generate_keypair(uint8_t pubkey[
CTASSERT(WG_EPHEMERAL_KEY_LEN == crypto_scalarmult_curve25519_BYTES);
- cprng_fast(privkey, WG_EPHEMERAL_KEY_LEN);
+ cprng_strong(kern_cprng, privkey, WG_EPHEMERAL_KEY_LEN, 0);
crypto_scalarmult_base(pubkey, privkey);
}
