]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
hcrypto: Avoid arc4random in kernel
authorAndrew Deason <adeason@sinenomine.net>
Wed, 7 Mar 2018 21:57:56 +0000 (15:57 -0600)
committerBenjamin Kaduk <kaduk@mit.edu>
Sun, 3 Jun 2018 14:08:55 +0000 (10:08 -0400)
Our HAVE_ARC4RANDOM symbol represents the availability of arc4random()
in userspace, not in the kernel. On Solaris, we'll define
HAVE_ARC4RANDOM, but the built kernel module will be unusable, since
we cannot resolve the arc4random symbol.

To to avoid this, undef HAVE_ARC4RANDOM when building hcrypto for the
kernel, just like we do with HAVE_GETUID.

Reviewed-on: https://gerrit.openafs.org/12946
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 6082243e42525c738239fe429bcb64e0e4f22207)

Change-Id: I41c4c6f65581aee3d53a7c4b8f6c108f88631e3f
Reviewed-on: https://gerrit.openafs.org/13101
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
src/crypto/hcrypto/kernel/config.h

index b6104348b3cfaadee7a42762c4f165a19623f731..6fec83da0f4e3375004eb0cfd2d819a306aaaeca 100644 (file)
@@ -95,6 +95,9 @@ static_inline int close(int d) {return -1;}
 #if defined(HAVE_GETUID)
 #undef HAVE_GETUID
 #endif
+#ifdef HAVE_ARC4RANDOM
+# undef HAVE_ARC4RANDOM
+#endif
 static_inline int gettimeofday(struct timeval *tp, void *tzp)
     {if (tp == NULL) return -1; tp->tv_sec = osi_Time(); tp->tv_usec = 0; return 0;}