Wordpress 3.0-scripts

[autoinstalls/wordpress.git] / wp-includes / class-phpass.php

diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php
index c964b09b10e41834a39afe87431e647ceba7d5b0..6d77a1cce9fd57870cfe3750ec227a404ddaeef9 100644 (file)
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -3,24 +3,16 @@
  * Portable PHP password hashing framework.
  * @package phpass
  * @since 2.5
- * @version 0.1
+ * @version 0.2 / genuine.
  * @link http://www.openwall.com/phpass/
  */
 
-#
-# Portable PHP password hashing framework.
-#
-# Version 0.1 / genuine.
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
 # the public domain.
 #
 # There's absolutely no warranty.
 #
-# The homepage URL for this framework is:
-#
-#      http://www.openwall.com/phpass/
-#
 # Please be sure to update the Version line if you edit this file in any way.
 # It is suggested that you leave the main version number intact, but indicate
 # your project name (after the slash) and add your own revision information.
@@ -32,6 +24,15 @@
 # Obviously, since this code is in the public domain, the above are not
 # requirements (there can be none), but merely suggestions.
 #
+
+/**
+ * Portable PHP password hashing framework.
+ *
+ * @package phpass
+ * @version 0.2 / genuine.
+ * @link http://www.openwall.com/phpass/
+ * @since 2.5
+ */
 class PasswordHash {
        var $itoa64;
        var $iteration_count_log2;
@@ -48,14 +49,14 @@ class PasswordHash {
 
                $this->portable_hashes = $portable_hashes;
 
-               $this->random_state = microtime() . (function_exists('getmypid') ? getmypid() : '') . uniqid(rand(), TRUE);
-       
+               $this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compability reasons
        }
 
        function get_random_bytes($count)
        {
                $output = '';
-               if (($fh = @fopen('/dev/urandom', 'rb'))) {
+               if ( @is_readable('/dev/urandom') &&
+                   ($fh = @fopen('/dev/urandom', 'rb'))) {
                        $output = fread($fh, $count);
                        fclose($fh);
                }