Merge branch 'feature/rand-refactor' of https://github.com/denixport/zf2

zendframework · Jul 24, 2012 · 9ecdb37 · 9ecdb37
11 parents 1b357ee + 4a7c17e + a40cc7f + a000f96 + fef31dc + 2b50632 + e854c8c + 450528a + 01abc0c + a277ee3 + 522f3e5
commit 9ecdb37
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/src/BlockCipher.php b/src/BlockCipher.php
@@ -14,7 +14,7 @@
 use Zend\Crypt\Key\Derivation\Pbkdf2;
 use Zend\Crypt\Symmetric\SymmetricInterface;
 use Zend\Crypt\Utils;
-use Zend\Math\Math;
+use Zend\Math\Rand;
 
 /**
  * Encrypt using a symmetric cipher then authenticate using HMAC (SHA-256)
@@ -319,7 +319,7 @@ public function encrypt($data)
         }
         $keySize = $this->cipher->getKeySize();
         // generate a random salt (IV)
-        $this->cipher->setSalt(Math::randBytes($this->cipher->getSaltSize(), true));
+        $this->cipher->setSalt(Rand::getBytes($this->cipher->getSaltSize(), true));
         // generate the encryption key and the HMAC key for the authentication
         $hash = Pbkdf2::calc(self::KEY_DERIV_HMAC,
                              $this->getKey(),

diff --git a/src/Password/Bcrypt.php b/src/Password/Bcrypt.php
@@ -12,7 +12,7 @@
 
 use Traversable;
 use Zend\Math\Exception as MathException;
-use Zend\Math\Math;
+use Zend\Math\Rand;
 use Zend\Stdlib\ArrayUtils;
 
 /**
@@ -24,10 +24,12 @@
 class Bcrypt implements PasswordInterface
 {
     const MIN_SALT_SIZE = 16;
+
     /**
      * @var string
      */
     protected $cost = '14';
+
     /**
      * @var string
      */
@@ -46,7 +48,7 @@ public function __construct($options = array())
                 $options = ArrayUtils::iteratorToArray($options);
             } elseif (!is_array($options)) {
                 throw new Exception\InvalidArgumentException(
-                    'The options parameter must be an array, a Zend\Config\Config object or a Traversable'
+                    'The options parameter must be an array or a Traversable'
                 );
             }
             foreach ($options as $key => $value) {
@@ -72,7 +74,7 @@ public function __construct($options = array())
     public function create($password)
     {
         if (empty($this->salt)) {
-            $salt = Math::randBytes(self::MIN_SALT_SIZE);
+            $salt = Rand::getBytes(self::MIN_SALT_SIZE);
         } else {
             $salt = $this->salt;
         }
@@ -88,12 +90,13 @@ public function create($password)
             // check if the password contains 8-bit character
             if (preg_match('/[\x80-\xFF]/', $password)) {
                 throw new Exception\RuntimeException(
-                        'The bcrypt implementation used by PHP can contains a security flaw using password with 8-bit character. ' .
-                        'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
+                    'The bcrypt implementation used by PHP can contains a security flaw ' .
+                    'using password with 8-bit character. ' .
+                    'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
                 );
             }
         }
-        $hash   = crypt($password, $prefix . $this->cost . '$' . $salt64);
+        $hash = crypt($password, $prefix . $this->cost . '$' . $salt64);
         if (strlen($hash) <= 13) {
             throw new Exception\RuntimeException('Error during the bcrypt generation');
         }

diff --git a/src/PublicKey/DiffieHellman.php b/src/PublicKey/DiffieHellman.php
@@ -64,7 +64,7 @@ class DiffieHellman
     private $privateKey = null;
 
     /**
-     * BigInteger support object courtesy of Zend\Math\Math
+     * BigInteger support object courtesy of Zend\Math
      *
      * @var \Zend\Math\BigInteger\Adapter\AdapterInterface
      */
@@ -438,7 +438,6 @@ protected function convert($number, $inputFormat = self::FORMAT_NUMBER,
      */
     protected function generatePrivateKey()
     {
-        $rand = Math\Math::randBytes(strlen($this->getPrime()), true);
-        return $rand;
+        return Math\Rand::getBytes(strlen($this->getPrime()), true);
     }
 }
diff --git a/test/Password/BcryptTest.php b/test/Password/BcryptTest.php
@@ -72,7 +72,7 @@ public function testConstructByConfig()
     public function testWrongConstruct()
     {
         $this->setExpectedException('Zend\Crypt\Password\Exception\InvalidArgumentException',
-                                    'The options parameter must be an array, a Zend\Config\Config object or a Traversable');
+                                    'The options parameter must be an array or a Traversable');
         $bcrypt = new Bcrypt('test');
     }
 
@@ -128,10 +128,12 @@ public function testPasswordWith8bitCharacter()
         $this->bcrypt->setSalt($this->salt);
 
         if (version_compare(PHP_VERSION, '5.3.7') >= 0) {
-            $this->assertEquals('$2y$14$MTIzNDU2Nzg5MDEyMzQ1NexAbOIUHkG6Ra.TK9QxHOVUhDxOe4dkW', $this->bcrypt->create($password));
+            $this->assertEquals('$2y$14$MTIzNDU2Nzg5MDEyMzQ1NexAbOIUHkG6Ra.TK9QxHOVUhDxOe4dkW',
+                                $this->bcrypt->create($password));
         } else {
             $this->setExpectedException('Zend\Crypt\Password\Exception\RuntimeException',
-                'The bcrypt implementation used by PHP can contains a security flaw using password with 8-bit character. ' .
+                'The bcrypt implementation used by PHP can contains a security flaw ' .
+                'using password with 8-bit character. ' .
                 'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
             );
             $output = $this->bcrypt->create($password);