From: Jonathan A. Kollasch <jakllsch@kollasch.net>
Date: Thu, 17 Apr 2014 16:03:11 +0000 (-0500)
Subject: NetBSD osi_crypto: use cprng(9) for random source on NetBSD 6.99/7.x
X-Git-Tag: upstream/1.8.0_pre1^2~481
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cbf67da1e5b8134be58bb1632be6ea69f2052cf5;p=packages%2Fo%2Fopenafs.git

NetBSD osi_crypto: use cprng(9) for random source on NetBSD 6.99/7.x

Change-Id: Id8ee7f149cdc921989a5de7dda35739147de0014
Reviewed-on: http://gerrit.openafs.org/11086
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/afs/NBSD/osi_crypto.c b/src/afs/NBSD/osi_crypto.c
index 134d458c6..e3f1f69b2 100644
--- a/src/afs/NBSD/osi_crypto.c
+++ b/src/afs/NBSD/osi_crypto.c
@@ -25,10 +25,20 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
+#ifdef AFS_NBSD70_ENV
+#include <sys/cprng.h>
+#else
 #include <sys/rnd.h>
+#include <dev/rnd_private.h>
+#endif
 
 int
 osi_readRandom(void *data, afs_size_t len) {
+#ifdef AFS_NBSD70_ENV
+    osi_Assert(len <= CPRNG_MAX_LEN);
+    cprng_strong(kern_cprng, data, len, 0);
+#else
     rnd_extract_data(data, len, RND_EXTRACT_ANY);
+#endif
     return 0;
 }