Changeset 3977

Timestamp:

12/27/11 19:48:29 (5 months ago)

Author:

tg

Message:

another long overdue update from MirBSD

Files:

• branches/freewrt_1_0/package/rdate/Makefile (modified) (1 diff)
• branches/freewrt_1_0/package/rdate/arc4random.c (modified) (14 diffs)
• trunk/freewrt/package/rdate/Makefile (modified) (1 diff)
• trunk/freewrt/toolchain/uClibc/files/arc4random.c (modified) (6 diffs)

branches/freewrt_1_0/package/rdate/Makefile

@@ -8 +8 @@
-
-PKG_NAME=               rdate
-090802
+100805
-PKG_RELEASE=            1
-a8fa4550b5a77cff6db1ed0a9d8aa357
+69f5e1e0f08c300d8a211acc2b2cee5f
-PKG_SOURCE_URL=         http://www.mirbsd.org/MirOS/dist/mir/rdate/
+
+WRKSRC=                 ${WRKDIR}/rdate
-
-include $(TOPDIR)/mk/package.mk

branches/freewrt_1_0/package/rdate/arc4random.c

@@ -1 +1 @@
-static const char __vcsid[] = "@(#) MirOS contributed arc4random.c (old)"
-19 2009/09/27 10:45:56
+28 2010/09/12 12:24:27
-    ;
-
@@ -33 +33 @@
-
-/*-
-
+, 2010
- *      Thorsten Glaser <tg@mirbsd.org>
- * This is arc4random(3) made more portable,
@@ -117 +117 @@
-
-static uint8_t arc4_getbyte(void);
-in
+uint8_
-static void arc4_atexit(void);
-static char arc4_writeback(uint8_t *, size_t, char);
@@ -125 +125 @@
-void arc4random_addrandom(u_char *, int);
-void arc4random_stir(void);
-def USE_MS_CRYPTOAPI
+ defined(USE_MS_CRYPTOAPI) || defined(OPPORTUNISTIC_ROOT_PUSHB)
-uint32_t arc4random_pushb(const void *, size_t);
-#endif
+#endif
+
+#define NEED_UNIFORM_BUF_PROTO
+#if defined(__OpenBSD__) && defined(OpenBSD) && (OpenBSD > 200805)
+#undef NEED_UNIFORM_BUF_PROTO
+#elif defined(__MirBSD__) && defined(MirBSD) && (MirBSD > 0x0AA4)
+#undef NEED_UNIFORM_BUF_PROTO
+#endif
+
+#ifdef NEED_UNIFORM_BUF_PROTO
+u_int32_t arc4random_uniform(u_int32_t);
+void arc4random_buf(void *, size_t);
-#endif
-
@@ -142 +154 @@
-
-static void
-u_char *dat, in
-
-int n
+const u_char *dat, size_
+
+size_t n = 0
-        uint8_t si;
-
-        arc4_ctx.i--;
-for (n = 0; n < 256; n++
+while (n < 256
-                arc4_ctx.i++;
-                si = arc4_ctx.s[arc4_ctx.i];
-
+++
-                arc4_ctx.s[arc4_ctx.i] = arc4_ctx.s[arc4_ctx.j];
-                arc4_ctx.s[arc4_ctx.j] = si;
-        }
+        arc4_ctx.i++;
-        arc4_ctx.j = arc4_ctx.i;
-}
+
+#if defined(USE_MS_CRYPTOAPI)
+#define RNDEV_BYTES     128
+#elif defined(__INTERIX)
+#define RNDEV_BYTES     4       /* slow /dev/urandom */
+#elif defined(__OpenBSD__)
+#define RNDEV_BYTES     (256 - (sizeof(struct timeval) + sizeof(pid_t)))
+#elif defined(__CYGWIN__)
+#define RNDEV_BYTES     64      /* /dev/urandom probably CryptoAPI */
+#elif defined(__FreeBSD__)
+#define RNDEV_BYTES     16      /* Yarrow has few state */
+#elif defined(__GLIBC__)
+#define RNDEV_BYTES     16      /* requested by maintainers */
+#else
+#define RNDEV_BYTES     8       /* unknown OS? */
+#endif
-
-static void
@@ -165 +194 @@
-                struct timeval tv;
-                pid_t pid;
-128 - (sizeof(struct timeval) + sizeof(pid_t))
+RNDEV_BYTES + sizeof(u_int) - 1
-        } rdat;
-        size_t sz = 0;
@@ -233 +262 @@
-
-static void
-in
+uint8_
-{
-        size_t n;
@@ -246 +275 @@
-         * We also discard a randomly fuzzed amount.
-         */
-
-
-
-
-
+
+
-        while (n--)
-                arc4_getbyte();
-
-++
+++
+
-        if (arc4_writeback(tb, sizeof(tb), 0))
-                arc4_getbyte();
-
+
+
+
-}
-
@@ -307 +335 @@
-arc4random(void)
-{
-
+
+
-                arc4random_stir();
-        return arc4_getword();
@@ -454 +483 @@
-}
-
-
+
+
-uint32_t
-arc4random_pushb(const void *src, size_t len)
@@ -461 +491 @@
-        union {
-                uint8_t buf[256];
-
+
+
+
+
+
+
-                uint32_t xbuf;
-        } idat;
-        const uint8_t *cbuf = (const uint8_t *)src;
-        uint32_t res = 1;
-
@@ -472 +506 @@
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                res = 0;
-
+
+
-        if (res)
-                res = idat.xbuf;
@@ -485 +527 @@
-                /* we got entropy from the kernel, so consider us stirred */
-                stir_finish(idat.buf[5]);
+        if (rlen)
+                (void)arc4_getbyte();
-        return (res ^ arc4_getword());
-}
@@ -506 +550 @@
-        arc4_writeback((uint8_t *)&buf, sizeof(buf), 0);
-}
+
+void
+arc4random_buf(void *_buf, size_t n)
+{
+        uint8_t *buf = (uint8_t *)_buf;
+
+        if (!rs_initialized || arc4_stir_pid != getpid())
+                arc4random_stir();
+        buf[0] = arc4_getbyte() % 3;
+        while (buf[0]--)
+                (void)arc4_getbyte();
+        while (n--) {
+                if (--arc4_count <= 0)
+                        arc4_stir();
+                buf[n] = arc4_getbyte();
+        }
+}
+
+/*-
+ * Written by Damien Miller.
+ * With simplifications by Jinmei Tatuya.
+ */
+
+/*
+ * Calculate a uniformly distributed random number less than
+ * upper_bound avoiding "modulo bias".
+ *
+ * Uniformity is achieved by generating new random numbers
+ * until the one returned is outside the range
+ * [0, 2^32 % upper_bound[. This guarantees the selected
+ * random number will be inside the range
+ * [2^32 % upper_bound, 2^32[ which maps back to
+ * [0, upper_bound[ after reduction modulo upper_bound.
+ */
+uint32_t
+arc4random_uniform(uint32_t upper_bound)
+{
+        uint32_t r, min;
+
+        if (upper_bound < 2)
+                return (0);
+
+#if defined(ULONG_MAX) && (ULONG_MAX > 0xFFFFFFFFUL)
+        min = 0x100000000UL % upper_bound;
+#else
+        /* calculate (2^32 % upper_bound) avoiding 64-bit math */
+        if (upper_bound > 0x80000000U)
+                /* 2^32 - upper_bound (only one "value area") */
+                min = 1 + ~upper_bound;
+        else
+                /* ((2^32 - x) % x) == (2^32 % x) when x <= 2^31 */
+                min = (0xFFFFFFFFU - upper_bound + 1) % upper_bound;
+#endif
+
+        /*
+         * This could theoretically loop forever but each retry has
+         * p > 0.5 (worst case, usually far better) of selecting a
+         * number inside the range we need, so it should rarely need
+         * to re-roll (at all).
+         */
+        arc4_count -= 4;
+        if (!rs_initialized || arc4_stir_pid != getpid() || arc4_count <= 0)
+                arc4random_stir();
+        if (arc4_getbyte() & 1)
+                (void)arc4_getbyte();
+        do {
+                r = arc4_getword();
+        } while (r < min);
+
+        return (r % upper_bound);
+}

trunk/freewrt/package/rdate/Makefile

@@ -8 +8 @@
-
-PKG_NAME=               rdate
-091122
+100805
-PKG_RELEASE=            1
-4914cdcf82cc6e8b30248fd6ea9e827
+69f5e1e0f08c300d8a211acc2b2cee5
-MASTER_SITES=           ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/}
-WRKDIST=                ${WRKDIR}/${PKG_NAME}

trunk/freewrt/toolchain/uClibc/files/arc4random.c

@@ -1 +1 @@
-static const char __vcsid[] = "@(#) MirOS contributed arc4random.c (old)"
-4 2009/11/29 18:24:21
+8 2010/09/12 12:24:27
-    ;
-
@@ -33 +33 @@
-
-/*-
-
+, 2010
- *      Thorsten Glaser <tg@mirbsd.org>
- * This is arc4random(3) made more portable,
@@ -167 +167 @@
-                arc4_ctx.s[arc4_ctx.j] = si;
-        }
+        arc4_ctx.i++;
-        arc4_ctx.j = arc4_ctx.i;
-}
@@ -278 +279 @@
-        while (n--)
-                arc4_getbyte();
-
-++
+++
+
-        if (arc4_writeback(tb, sizeof(tb), 0))
-                arc4_getbyte();
@@ -567 +568 @@
-}
-
+/*-
+ * Written by Damien Miller.
+ * With simplifications by Jinmei Tatuya.
+ */
+
-/*
- upper_bound
-
+
+upper_bound 
- *
-
-
-
-
-
+
+
+
+
+
+
- */
-_
-_
-
-_
+
+
+
+
-
-        if (upper_bound < 2)
-                return (0);
-
-ffffffff
+FFFFFFFF
-        min = 0x100000000UL % upper_bound;
-#else
-Calculate (2**
-
-min = 1 + ~upper_bound;                /* 2**32 - upper_bound
-else {
-       /* (2**32 - (x * 2)) % x == 2**32 % x when x <= 2**31 */
-min = ((0xffffffff - (upper_bound * 2)) + 1) % upper_bound;
-}
+calculate (2^
+U
+/* 2^32 - upper_bound (only one "value area")
+       min = 1 + ~upper_bound;
+else
+/* ((2^32 - x) % x) == (2^32 % x) when x <= 2^31 */
+       min = (0xFFFFFFFFU - upper_bound + 1) % upper_bound;
-#endif
-
@@ -601 +608 @@
-         * p > 0.5 (worst case, usually far better) of selecting a
-         * number inside the range we need, so it should rarely need
-
+ (at all)
-         */
-
+
+
-                arc4random_stir();
-        if (arc4_getbyte() & 1)
-                (void)arc4_getbyte();
-
-
-
-
+
-                r = arc4_getword();
-
-
-
+
-
-        return (r % upper_bound);