[src/trunk]: src/sys Remove rnd_extract_data from the public kernel API (it i...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Remove rnd_extract_data from the public kernel API (it i...
From: tls <tls%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 21:43:12 +0000
details:   https://anonhg.NetBSD.org/src/rev/d66e5daefd5a
branches:  trunk
changeset: 771694:d66e5daefd5a
user:      tls <tls%NetBSD.org@localhost>
date:      Tue Nov 29 03:50:31 2011 +0000

description:
Remove rnd_extract_data from the public kernel API (it is for use by the
stream generators only).  Clean up some related minor issues.

diffstat:

 sys/dev/iscsi/iscsi_globals.h |  21 +--------------
 sys/dev/iscsi/iscsi_test.c    |   5 ++-
 sys/dev/iscsi/iscsi_text.c    |   7 +++-
 sys/dev/pci/hifn7751.c        |   8 +++--
 sys/dev/rnd.c                 |   6 ++-
 sys/dev/rnd_private.h         |  58 +++++++++++++++++++++++++++++++++++++++++++
 sys/dev/rndpool.c             |  11 ++++---
 sys/kern/subr_cprng.c         |   5 ++-
 sys/lib/libkern/arc4random.c  |   3 +-
 sys/sys/rnd.h                 |  45 ++++++--------------------------
 10 files changed, 96 insertions(+), 73 deletions(-)

diffs (truncated from 382 to 300 lines):

diff -r 97e6ecf55e09 -r d66e5daefd5a sys/dev/iscsi/iscsi_globals.h
--- a/sys/dev/iscsi/iscsi_globals.h     Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/dev/iscsi/iscsi_globals.h     Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsi_globals.h,v 1.1 2011/10/23 21:15:02 agc Exp $    */
+/*     $NetBSD: iscsi_globals.h,v 1.2 2011/11/29 03:50:31 tls Exp $    */
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -554,25 +554,6 @@
 uint8_t InitiatorAlias[ISCSI_STRING_LENGTH];
 login_isid_t InitiatorISID;
 
-
-/* -------------------------  Global Functions  ----------------------------- */
-
-#ifdef __NetBSD__
-#define GEN_RAND(buffer, len) rnd_extract_data (buffer, len, RND_EXTRACT_ANY)
-#else
-#define GEN_RAND(buffer, len) get_random_bytes (buffer, len)
-#endif
-
-static __inline uint8_t
-randb(void)
-{
-       uint8_t buf;
-
-       GEN_RAND(&buf, 1);
-       return buf;
-}
-
-
 /* Debugging and profiling stuff */
 
 #include "iscsi_profile.h"
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/dev/iscsi/iscsi_test.c
--- a/sys/dev/iscsi/iscsi_test.c        Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/dev/iscsi/iscsi_test.c        Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsi_test.c,v 1.1 2011/10/23 21:15:02 agc Exp $       */
+/*     $NetBSD: iscsi_test.c,v 1.2 2011/11/29 03:50:31 tls Exp $       */
 
 /*-
  * Copyright (c) 2006,2011 The NetBSD Foundation, Inc.
@@ -269,7 +269,8 @@
 STATIC int
 check_loss(test_pars_t *tp, int rxtx)
 {
-       return (tp->lose_random[rxtx]) ? (randb() % tp->lose_random[rxtx]) : 0;
+       return (tp->lose_random[rxtx]) ?
+               (cprng_fast32() % tp->lose_random[rxtx]) : 0;
 }
 
 
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/dev/iscsi/iscsi_text.c
--- a/sys/dev/iscsi/iscsi_text.c        Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/dev/iscsi/iscsi_text.c        Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsi_text.c,v 1.1 2011/10/23 21:15:02 agc Exp $       */
+/*     $NetBSD: iscsi_text.c,v 1.2 2011/11/29 03:50:31 tls Exp $       */
 
 /*-
  * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
 #include "iscsi_globals.h"
 #include "base64.h"
 #include <sys/md5.h>
+#include <sys/cprng.h>
 
 #define isdigit(x) ((x) >= '0' && (x) <= '9')
 #define toupper(x) ((x) & ~0x20)
@@ -1456,7 +1457,9 @@
                                return ISCSI_STATUS_PARAMETER_MISSING;
                        }
 
-                       GEN_RAND(&state->temp_buf[CHAP_MD5_SIZE], CHAP_CHALLENGE_LEN + 1);
+                       cprng_strong(kern_cprng,
+                                    &state->temp_buf[CHAP_MD5_SIZE],
+                                    CHAP_CHALLENGE_LEN + 1);
                        set_key_n(state, K_Auth_CHAP_Identifier,
                                          state->temp_buf[CHAP_MD5_SIZE]);
                        cpar = set_key_s(state, K_Auth_CHAP_Challenge,
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/dev/pci/hifn7751.c
--- a/sys/dev/pci/hifn7751.c    Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/dev/pci/hifn7751.c    Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hifn7751.c,v 1.47 2011/11/19 22:51:23 tls Exp $        */
+/*     $NetBSD: hifn7751.c,v 1.48 2011/11/29 03:50:31 tls Exp $        */
 /*     $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
 /*     $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $  */
 
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.47 2011/11/19 22:51:23 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.48 2011/11/29 03:50:31 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -65,6 +65,8 @@
 #else
 #include <opencrypto/cryptodev.h>
 #include <sys/cprng.h>
+#include <sys/rnd.h>
+#include <sys/sha1.h>
 #endif
 
 #include <dev/pci/pcireg.h>
@@ -544,7 +546,7 @@
 {
        struct hifn_softc *sc = vsc;
 #ifdef __NetBSD__
-       u_int32_t num[HIFN_RNG_BITSPER * RND_ENTROPY_THRESHOLD];
+       u_int32_t num[HIFN_RNG_BITSPER * SHA1_DIGEST_LENGTH];
 #else
        u_int32_t num[2];
 #endif
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/dev/rnd.c
--- a/sys/dev/rnd.c     Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/dev/rnd.c     Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rnd.c,v 1.87 2011/11/28 07:56:54 tls Exp $     */
+/*     $NetBSD: rnd.c,v 1.88 2011/11/29 03:50:31 tls Exp $     */
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.87 2011/11/28 07:56:54 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.88 2011/11/29 03:50:31 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -54,6 +54,8 @@
 #include <sys/rngtest.h>
 #include <sys/cpu.h>   /* XXX temporary, see rnd_detach_source */
 
+#include <dev/rnd_private.h>
+
 #if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
 #include <machine/cpu_counter.h>
 #endif
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/dev/rnd_private.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/rnd_private.h     Tue Nov 29 03:50:31 2011 +0000
@@ -0,0 +1,58 @@
+/*      $NetBSD: rnd_private.h,v 1.1 2011/11/29 03:50:31 tls Exp $     */
+
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Michael Graff <explorer%flame.org@localhost>.  This code uses ideas and
+ * algorithms from the Linux driver written by Ted Ts'o.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DEV_RNDPRIVATE_H
+#define _DEV_RNDPRIVATE_H
+/*
+ * Number of bytes returned per hash.  This value is used in both
+ * rnd.c and rndpool.c to decide when enough entropy exists to do a
+ * hash to extract it.
+ */
+#define RND_ENTROPY_THRESHOLD   10
+
+/*
+ * Size of the event queue.  This _MUST_ be a power of 2.
+ */
+#ifndef RND_EVENTQSIZE
+#define RND_EVENTQSIZE  128
+#endif
+
+/*
+ * Used by rnd_extract_data() and rndpool_extract_data() to describe how
+ * "good" the data has to be.
+ */
+#define RND_EXTRACT_ANY                0  /* extract anything, even if no entropy */
+#define RND_EXTRACT_GOOD       1  /* return as many good bytes
+                                     (short read ok) */
+
+uint32_t        rnd_extract_data(void *, uint32_t, uint32_t);
+#endif
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/dev/rndpool.c
--- a/sys/dev/rndpool.c Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/dev/rndpool.c Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rndpool.c,v 1.20 2008/04/28 20:23:47 martin Exp $        */
+/*      $NetBSD: rndpool.c,v 1.21 2011/11/29 03:50:31 tls Exp $        */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,13 +31,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpool.c,v 1.20 2008/04/28 20:23:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpool.c,v 1.21 2011/11/29 03:50:31 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sha1.h>
 
 #include <sys/rnd.h>
+#include <dev/rnd_private.h>
 
 /*
  * The random pool "taps"
@@ -64,7 +65,7 @@
        rp->stats.threshold = RND_ENTROPY_THRESHOLD;
        rp->stats.maxentropy = RND_POOLBITS;
 
-       KASSERT(RND_ENTROPY_THRESHOLD*2 <= 20); /* XXX sha knowledge */
+       KASSERT(RND_ENTROPY_THRESHOLD * 2 <= SHA1_DIGEST_LENGTH);
 }
 
 u_int32_t
@@ -250,7 +251,7 @@
 {
        u_int i;
        SHA1_CTX hash;
-       u_char digest[20];      /* XXX SHA knowledge */
+       u_char digest[SHA1_DIGEST_LENGTH];
        u_int32_t remain, deltae, count;
        u_int8_t *buf;
        int good;
@@ -263,7 +264,7 @@
        else
                good = (rp->stats.curentropy >= (8 * RND_ENTROPY_THRESHOLD));
 
-       KASSERT(RND_ENTROPY_THRESHOLD*2 <= 20); /* XXX SHA knowledge */
+       KASSERT(RND_ENTROPY_THRESHOLD * 2 <= sizeof(digest));
 
        while (good && (remain != 0)) {
                /*
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/kern/subr_cprng.c
--- a/sys/kern/subr_cprng.c     Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/kern/subr_cprng.c     Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_cprng.c,v 1.2 2011/11/21 13:44:38 tsutsui Exp $ */
+/*     $NetBSD: subr_cprng.c,v 1.3 2011/11/29 03:50:31 tls Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
 #include <sys/mutex.h>
 #include <sys/rngtest.h>
 #include <sys/rnd.h>
+#include <dev/rnd_private.h>
 
 #if defined(__HAVE_CPU_COUNTER)
 #include <machine/cpu_counter.h>
@@ -45,7 +46,7 @@
 
 #include <sys/cprng.h>
 
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.2 2011/11/21 13:44:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.3 2011/11/29 03:50:31 tls Exp $");
 
 void
 cprng_init(void)
diff -r 97e6ecf55e09 -r d66e5daefd5a sys/lib/libkern/arc4random.c
--- a/sys/lib/libkern/arc4random.c      Tue Nov 29 03:40:41 2011 +0000
+++ b/sys/lib/libkern/arc4random.c      Tue Nov 29 03:50:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arc4random.c,v 1.27 2011/11/28 08:05:05 tls Exp $      */
+/*     $NetBSD: arc4random.c,v 1.28 2011/11/29 03:50:32 tls Exp $      */
 
 /*-
  * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -70,6 +70,7 @@
 
 #if NRND > 0
 #include <sys/rnd.h>
+#include <dev/rnd_private.h>
Prev by Date: [src/trunk]: src/share/man/man9 Spelling.
Next by Date: [src/trunk]: src Add (links for) missing "cross-references" from cprng(9). S...
Previous by Thread: [src/trunk]: src/share/man/man9 Spelling.
Next by Thread: [src/trunk]: src Add (links for) missing "cross-references" from cprng(9). S...
Indexes:
Home | Main Index | Thread Index | Old Index