Changeset 2146

Timestamp:

02/22/2008 03:34:00 PM (11 months ago)

Author:

Shadowhand

Message:

Fixing #429, thanks canglan.

Files:

• trunk/system/libraries/Encrypt.php (modified) (1 diff)

trunk/system/libraries/Encrypt.php

@@ -81 +81 @@
                 if (self::$rand === NULL)
                 {
-                        if (defined('MCRYPT_DEV_URANDOM'))
+                        if (KOHANA_IS_WIN)
                         {
-                                // Use /dev/urandom
-                                self::$rand = MCRYPT_DEV_URANDOM;
-                        }
-                        elseif (defined('MCRYPT_DEV_RANDOM'))
-                        {
-                                // Use /dev/random
-                                self::$rand = MCRYPT_DEV_RANDOM;
+                                // Windows only supports the system random number generator
+                                self::$rand = MCRYPT_RAND;
                         }
                         else
                         {
-                                // Use the system random number generator
-                                self::$rand = MCRYPT_RAND;
+                                if (defined('MCRYPT_DEV_URANDOM'))
+                                {
+                                        // Use /dev/urandom
+                                        self::$rand = MCRYPT_DEV_URANDOM;
+                                }
+                                elseif (defined('MCRYPT_DEV_RANDOM'))
+                                {
+                                        // Use /dev/random
+                                        self::$rand = MCRYPT_DEV_RANDOM;
+                                }
+                                else
+                                {
+                                        // Use the system random number generator
+                                        self::$rand = MCRYPT_RAND;
+                                }
                         }
                 }