Module Name: src
Committed By: riastradh
Date: Mon Apr 13 15:51:00 UTC 2015
Modified Files:
src/sys/crypto/cprng_fast: cprng_fast.c
src/sys/netinet: tcp_subr.c
Log Message:
cprng_strong(kern_cprng, ...) never blocks, pass 0 for flags.
FASYNC was wrong anyway! It's FNONBLOCK.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/crypto/cprng_fast/cprng_fast.c
cvs rdiff -u -r1.258 -r1.259 src/sys/netinet/tcp_subr.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/crypto/cprng_fast/cprng_fast.c
diff -u src/sys/crypto/cprng_fast/cprng_fast.c:1.11 src/sys/crypto/cprng_fast/cprng_fast.c:1.12
--- src/sys/crypto/cprng_fast/cprng_fast.c:1.11 Mon Aug 11 22:36:49 2014
+++ src/sys/crypto/cprng_fast/cprng_fast.c Mon Apr 13 15:51:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng_fast.c,v 1.11 2014/08/11 22:36:49 justin Exp $ */
+/* $NetBSD: cprng_fast.c,v 1.12 2015/04/13 15:51:00 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.11 2014/08/11 22:36:49 justin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.12 2015/04/13 15:51:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -233,7 +233,7 @@ cprng_fast_init_cpu(void *p, void *arg _
struct cprng_fast *const cprng = p;
uint8_t seed[CPRNG_FAST_SEED_BYTES];
- cprng_strong(kern_cprng, seed, sizeof seed, FASYNC);
+ cprng_strong(kern_cprng, seed, sizeof seed, 0);
cprng_fast_seed(cprng, seed);
cprng->have_initial = rnd_initial_entropy;
(void)explicit_memset(seed, 0, sizeof seed);
@@ -278,7 +278,7 @@ cprng_fast_intr(void *cookie __unused)
uint8_t seed[CPRNG_FAST_SEED_BYTES];
int s;
- cprng_strong(kern_cprng, seed, sizeof(seed), FASYNC);
+ cprng_strong(kern_cprng, seed, sizeof(seed), 0);
cprng = percpu_getref(cprng_fast_percpu);
s = splvm();
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.258 src/sys/netinet/tcp_subr.c:1.259
--- src/sys/netinet/tcp_subr.c:1.258 Sat Feb 14 12:57:53 2015
+++ src/sys/netinet/tcp_subr.c Mon Apr 13 15:51:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.258 2015/02/14 12:57:53 he Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.259 2015/04/13 15:51:00 riastradh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.258 2015/02/14 12:57:53 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.259 2015/04/13 15:51:00 riastradh Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -2248,7 +2248,7 @@ tcp_new_iss1(void *laddr, void *faddr, u
*/
if (tcp_iss_gotten_secret == false) {
cprng_strong(kern_cprng,
- tcp_iss_secret, sizeof(tcp_iss_secret), FASYNC);
+ tcp_iss_secret, sizeof(tcp_iss_secret), 0);
tcp_iss_gotten_secret = true;
}
