[minion-cvs] Stop trying to use Unix entropy sources when running on...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv2480/lib/mixminion

Modified Files:
	Crypto.py 
Log Message:
Stop trying to use Unix entropy sources when running on win32.

Index: Crypto.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Crypto.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Crypto.py	4 Dec 2003 05:02:50 -0000	1.58
+++ Crypto.py	4 Dec 2003 05:53:13 -0000	1.59
@@ -702,6 +702,17 @@
        none is provided, tries some sane defaults."""
     global _TRNG_FILENAME
     global _theTrueRNG
+
+    if sys.platform == 'win32':
+        # We have two entropy sources on windows: openssl's built-in
+        # entropy generator that takes data from the screen, and
+        # Windows's CryptGenRandom function.  Because the former is
+        # insecure, and the latter is closed-source, we xor them.
+        _ml.win32_openssl_seed()
+        _ml.openssl_seed(_ml.win32_get_random_bytes(32))
+        _theTrueRNG = _XorRNG(_OpensslRNG(), _WinTrueRNG())
+        return
+
     if config is not None:
         requestedFile = config['Host'].get('EntropySource')
     else:
@@ -734,19 +745,9 @@
                 break
 
     if randFile is None and _TRNG_FILENAME is None:
-        #XXXX006 on win32, we should do this first.
-        if sys.platform == 'win32':
-            # We have two entropy sources on windows: openssl's built-in
-            # entropy generator that takes data from the screen, and
-            # Windows's CryptGenRandom function.  Because the former is
-            # insecure, and the latter is closed-source, we xor them.
-            _ml.win32_openssl_seed()
-            _ml.openssl_seed(_ml.win32_get_random_bytes(32))
-            _theTrueRNG = _XorRNG(_OpensslRNG(), _WinTrueRNG())
-        else:
-            LOG.fatal("No entropy source available: Tried all of %s",
-                      files)
-            raise MixFatalError("No entropy source available")
+        LOG.fatal("No entropy source available: Tried all of %s",
+                  files)
+        raise MixFatalError("No entropy source available")
     elif randFile is None:
         LOG.warn("Falling back to previous entropy source %s",
                  _TRNG_FILENAME)
@@ -799,6 +800,7 @@
     """Random number generator that falls back to openssl's implementation."""
     def __init__(self):
         RNG.__init__(self, 1024)
+        self.getBytes(1)
     def _prng(self,n):
         return _ml.openssl_rand(n)