R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: wireguard: selftests: simplify RNG seeding

Browse Source 
commit ca93ca23409b827b48a2fc0a692496d3f7b67944 upstream.

The seed_rng() function was written to work across lots of old kernels,
back when WireGuard used a big compatibility layer. Now that things have
evolved, we can vastly simplify this, by just marking the RNG as seeded.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
Change-Id: Ife7c675fa84d662ad1738785046260466982bef5
This commit is contained in:
Jason A. Donenfeld 2022-03-29 21:31:25 -04:00 committed by spakkkk
parent e5713d4226
commit 4bf1eee11c
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/testing/selftests/wireguard/qemu/init.c
View File

@ -56,26 +56,14 @@ static void print_banner(void)
static void seed_rng(void) static void seed_rng(void)
{ {
int fd; int bits = 256, fd;
struct {
int entropy_count;
int buffer_size;
unsigned char buffer[256];
} entropy = {
.entropy_count = sizeof(entropy.buffer) * 8,
.buffer_size = sizeof(entropy.buffer),
.buffer = "Adding real entropy is not actually important for these tests. Don't try this at home, kids!"
};
if (mknod("/dev/urandom", S_IFCHR | 0644, makedev(1, 9))) pretty_message("[+] Fake seeding RNG...");
panic("mknod(/dev/urandom)"); fd = open("/dev/random", O_WRONLY);
fd = open("/dev/urandom", O_WRONLY);
if (fd < 0) if (fd < 0)
panic("open(urandom)"); panic("open(random)");
for (int i = 0; i < 256; ++i) { if (ioctl(fd, RNDADDTOENTCNT, &bits) < 0)
if (ioctl(fd, RNDADDENTROPY, &entropy) < 0) panic("ioctl(RNDADDTOENTCNT)");
panic("ioctl(urandom)");
}
close(fd); close(fd);
} }
@ -270,10 +258,10 @@ static void check_leaks(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
seed_rng();
ensure_console(); ensure_console();
print_banner(); print_banner();
mount_filesystems(); mount_filesystems();
seed_rng();
kmod_selftests(); kmod_selftests();
enable_logging(); enable_logging();
clear_leaks(); clear_leaks();