 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_cprng.c,v 1.34 2019/12/04 05:36:34 riastradh Exp $ */
+/*	$NetBSD: subr_cprng.c,v 1.35 2020/04/12 07:16:09 maxv Exp $ */
 /*-
  * Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Thor Lancelot Simon and Taylor R. Campbell.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.34 2019/12/04 05:36:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.35 2020/04/12 07:16:09 maxv Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/condvar.h>
 #include <sys/cprng.h>
 #include <sys/errno.h>
 #include <sys/event.h>		/* XXX struct knote */
 #include <sys/fcntl.h>		/* XXX FNONBLOCK */
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/lwp.h>
 #include <sys/once.h>
 #include <sys/percpu.h>
 @@ -241,26 +241,42 @@ cprng_strong(struct cprng_strong *cprng,
 		KASSERT(bytes <= NIST_HASH_DRBG_MIN_SEEDLEN_BYTES);
 		KASSERT(0 < cprng->cs_remaining);
 		KASSERT(cprng->cs_remaining <=
 		    NIST_HASH_DRBG_MIN_SEEDLEN_BYTES);
+	}
 	cprng_strong_generate(cprng, buffer, bytes);
 	result = bytes;
 out:	mutex_exit(&cprng->cs_lock);
 	return result;
+}
 uint32_t
 cprng_strong32(void)
+{
 	uint32_t r;
 	cprng_strong(kern_cprng, &r, sizeof(r), 0);
 	return r;
+}
 uint64_t
 cprng_strong64(void)
+{
 	uint64_t r;
 	cprng_strong(kern_cprng, &r, sizeof(r), 0);
 	return r;
+}
 static void
 filt_cprng_detach(struct knote *kn)
+{
 	struct cprng_strong *const cprng = kn->kn_hook;
 	mutex_enter(&cprng->cs_lock);
 	SLIST_REMOVE(&cprng->cs_selq.sel_klist, kn, knote, kn_selnext);
 	mutex_exit(&cprng->cs_lock);
+}
 static int
 filt_cprng_read_event(struct knote *kn, long hint)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cprng.h,v 1.15 2019/09/02 20:09:30 riastradh Exp $ */
+/*	$NetBSD: cprng.h,v 1.16 2020/04/12 07:16:09 maxv Exp $ */
 /*-
  * Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Thor Lancelot Simon and Taylor R. Campbell.
+ *
  * 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.
 @@ -61,30 +61,17 @@ b\2USE_CV\0\
 b\3HARD\0"
 cprng_strong_t *
 	cprng_strong_create(const char *, int, int);
 void	cprng_strong_destroy(cprng_strong_t *);
 size_t	cprng_strong(cprng_strong_t *, void *, size_t, int);
 struct knote;			/* XXX temp, for /dev/random */
 int	cprng_strong_kqfilter(cprng_strong_t *, struct knote *); /* XXX " */
 int	cprng_strong_poll(cprng_strong_t *, int); /* XXX " */
 extern cprng_strong_t	*kern_cprng;
-static __inline uint32_t
+uint32_t cprng_strong32(void);
-cprng_strong32(void)
+uint64_t cprng_strong64(void);
 	uint32_t r;
 	cprng_strong(kern_cprng, &r, sizeof(r), 0);
 	return r;
 static __inline uint64_t
 cprng_strong64(void)
 	uint64_t r;
 	cprng_strong(kern_cprng, &r, sizeof(r), 0);
 	return r;
 #endif	/* _CPRNG_H */