overhaul the random stuff ;-)

rnd.c

@@ -0,0 +1,85 @@
+/* $MirBSD: rnd.c,v 1.1 2004/05/24 19:06:55 tg Exp $
+ *-
+ * Copyright (c) 2004
+ *	Thorsten Glaser <x86@ePost.de>
+ *
+ * Licensee is hereby permitted to deal in this work without restric-
+ * tion, including unlimited rights to use, publically perform, modi-
+ * fy, merge, distribute, sell, give away or sublicence, provided the
+ * above copyright notices, these terms and the disclaimer are retai-
+ * ned in all redistributions, or reproduced in accompanying documen-
+ * tation or other materials provided with binary redistributions.
+ *
+ * Licensor hereby provides this work "AS IS" and WITHOUT WARRANTY of
+ * any kind, expressed or implied, to the maximum extent permitted by
+ * applicable law, but with the warranty of being written without ma-
+ * licious intent or gross negligence; in no event shall an author or
+ * contributor be held liable for any direct, indirect or other dama-
+ * ge, however caused, arising in any way out of the usage of covered
+ * work, even if advised of the possibility of such damage.
+ */
+
+#include "sh.h"
+#include "proto.h"
+
+#ifndef	HAVE_SRANDOM
+#undef	HAVE_RANDOM
+#endif
+
+#ifdef	KSH
+
+int rnd_state;
+
+void
+rnd_seed(long newval)
+{
+	rnd_put(time(NULL) ^ (getpid() << 16) ^ newval);
+	rnd_state = 0;
+}
+
+long
+rnd_get(void)
+{
+#ifdef	HAVE_ARC4RANDOM
+	if (!rnd_state) {
+		return arc4random() & 0x7FFF;
+	} else
+#endif
+#ifdef	HAVE_RANDOM
+	return random() & 0x7FFF;
+#else
+	return rand();
+#endif
+}
+
+void
+rnd_put(long newval)
+{
+	u_int32_t sv;
+
+	rnd_state = 1 | rnd_get();
+	sv = (((u_int32_t)rnd_get()) << (newval & 7)) ^ (u_int32_t)newval;
+
+#if defined(HAVE_ARC4RANDOM_PUSH)
+	arc4random_push(sv);
+#elif defined(HAVE_ARC4RANDOM_ADDRANDOM)
+	arc4random_addrandom(sv, 4);
+#endif
+#ifdef	HAVE_ARC4RANDOM
+	sv ^= arc4random();
+#endif
+
+#ifdef	HAVE_RANDOM
+	srandom(sv);
+#else
+	srand(sv);
+#endif
+
+	while (rnd_state) {
+		rnd_get();
+		rnd_state >>= 1;
+	}
+	rnd_state = 1;
+}
+
+#endif	/* def KSH */