Merge branch 'master' of https://github.com/zendframework/zf2 into Ib…

…anSepa
zendframework · Jul 31, 2012 · a212dd6 · a212dd6
14 parents 6893542 + b251bdd + 9ecdb37 + 1b357ee + 4a7c17e + a40cc7f + a000f96 + fef31dc + 2b50632 + e854c8c + 450528a + 01abc0c + af61218 + cbe8a27
commit a212dd6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/PublicKey/Rsa.php b/src/PublicKey/Rsa.php
@@ -185,6 +185,12 @@ public function verify($data, $signature, Rsa\PublicKey $publicKey = null)
             $publicKey = $this->options->getPublicKey();
         }
 
+        // check if signature is encoded in Base64
+        $output = base64_decode($signature, true);
+        if (false !== $output) {
+            $signature = $output;
+        }
+
         $result = openssl_verify(
             $data,
             $signature,
@@ -245,6 +251,12 @@ public function decrypt($data, Rsa\AbstractKey $key = null)
             throw new Exception\InvalidArgumentException('No key specified for the decryption');
         }
 
+        // check if data is encoded in Base64
+        $output = base64_decode($data, true);
+        if (false !== $output) {
+            $data = $output;
+        }
+
         return $key->decrypt($data);
     }
 

diff --git a/test/PublicKey/RsaTest.php b/test/PublicKey/RsaTest.php
@@ -261,7 +261,7 @@ public function testVerifyVerifiesBinarySignaturesUsingCertificate()
     public function testVerifyVerifiesBase64Signatures()
     {
         $signature = $this->rsaBase64Out->sign('1234567890');
-        $result    = $this->rsaBase64Out->verify('1234567890', base64_decode($signature));
+        $result    = $this->rsaBase64Out->verify('1234567890', $signature);
 
         $this->assertSame(true, $result);
     }
@@ -308,7 +308,7 @@ public function testEncryptionUsingPublicKeyBase64Encryption()
         $this->assertEquals(
             '1234567890',
             $this->rsaBase64Out->decrypt(
-                base64_decode($encrypted),
+                $encrypted,
                 $this->rsaBase64Out->getOptions()->getPrivateKey()
             )
         );