---

yaml
---
r: 4813
b: refs/heads/master
c: ddc2076
h: refs/heads/master
i:
  4811: 947af0e
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a00fab2492245bd637269a1a65ab6975ee17da2
+refs/heads/master: ddc2076902c7286c3766c406e17d63a1eac90098

trunk/src/rt/rust_util.h

@@ -130,8 +130,15 @@ isaac_init(sched_or_kernel *sched, randctx *rctx)
 {
         memset(rctx, 0, sizeof(randctx));
 
+        char *rust_seed = sched->env->rust_seed;
+        if (rust_seed != NULL) {
+            ub4 seed = (ub4) atoi(rust_seed);
+            for (size_t i = 0; i < RANDSIZ; i ++) {
+                memcpy(&rctx->randrsl[i], &seed, sizeof(ub4));
+                seed = (seed + 0x7ed55d16) + (seed << 12);
+            }
+        } else {
 #ifdef __WIN32__
-        {
             HCRYPTPROV hProv;
             sched->win32_require
                 (_T("CryptAcquireContext"),
@@ -144,24 +151,16 @@ isaac_init(sched_or_kernel *sched, randctx *rctx)
             sched->win32_require
                 (_T("CryptReleaseContext"),
                  CryptReleaseContext(hProv, 0));
-        }
 #else
-        char *rust_seed = sched->env->rust_seed;
-        if (rust_seed != NULL) {
-            ub4 seed = (ub4) atoi(rust_seed);
-            for (size_t i = 0; i < RANDSIZ; i ++) {
-                memcpy(&rctx->randrsl[i], &seed, sizeof(ub4));
-                seed = (seed + 0x7ed55d16) + (seed << 12);
-            }
-        } else {
             int fd = open("/dev/urandom", O_RDONLY);
             I(sched, fd > 0);
             I(sched,
               read(fd, (void*) &rctx->randrsl, sizeof(rctx->randrsl))
               == sizeof(rctx->randrsl));
             I(sched, close(fd) == 0);
-        }
 #endif
+        }
+
         randinit(rctx, 1);
 }