Merge branch 'crypt-error' of http://github.com/mikaelkael/zf2 into m…

…erges/mikaelkael-crypt-error
zendframework · Nov 2, 2010 · c608ff3 · c608ff3
3 parents acc6091 + 5337eeb + 56c1b58
commit c608ff3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Math.php b/src/Math.php
@@ -22,7 +22,7 @@
 /**
  * @namespace
  */
-namespace Zend\Crypt\Math;
+namespace Zend\Crypt;
 
 /**
  * @uses       Zend\Crypt\Math\BigInteger
@@ -70,7 +70,7 @@ public function rand($minimum, $maximum)
      * @param string $long
      * @return string
      */
-    public function btwoc($long) 
+    public function btwoc($long)
     {
         if (ord($long[0]) > 127) {
             return "\x00" . $long;
@@ -84,7 +84,7 @@ public function btwoc($long)
      * @param string $binary
      * @return string
      */
-    public function fromBinary($binary) 
+    public function fromBinary($binary)
     {
         return $this->_math->binaryToInteger($binary);
     }

diff --git a/test/DiffieHellmanTest.php b/test/DiffieHellmanTest.php
@@ -145,7 +145,7 @@ public function testDiffieWithBinaryFormsAndLargeIntegers_OpensslTest()
 
     public function testGenerateKeysWithUnsetPrivateKey()
     {
-        $dh = new Zend_Crypt_DiffieHellman(563, 5);
+        $dh = new DiffieHellman(563, 5);
         $dh->generateKeys();
         $privateKey = $dh->getPrivateKey();
         $this->assertNotNull($privateKey);