Merge branch 'hotfix/3550' into develop

Forward port zendframework/zendframework#3550
zendframework · Jan 25, 2013 · ddb5852 · ddb5852
commit ddb5852
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 28 deletions.
diff --git a/src/Encrypt/BlockCipher.php b/src/Encrypt/BlockCipher.php
@@ -30,15 +30,13 @@ class BlockCipher implements EncryptionAlgorithmInterface
      *     'key_iteration' => the number of iterations for the PBKDF2 key generation
      *     'algorithm      => cipher algorithm to use
      *     'hash'          => algorithm to use for the authentication
-     *     'iv'            => initialization vector
+     *     'vector'        => initialization vector
      * )
      */
     protected $encryption = array(
-        'key'                 => 'ZendFramework',
         'key_iteration'       => 5000,
         'algorithm'           => 'aes',
         'hash'                => 'sha256',
-        'vector'              => null,
     );
 
     /**
@@ -178,6 +176,34 @@ public function setVector($vector)
         return $this;
     }
 
+    /**
+     * Set the encryption key
+     *
+     * @param  string $key
+     * @return BlockCipher
+     * @throws Exception\InvalidArgumentException
+     */
+    public function setKey($key)
+    {
+        try {
+            $this->blockCipher->setKey($key);
+        } catch (CryptException\InvalidArgumentException $e) {
+            throw new Exception\InvalidArgumentException($e->getMessage());
+        }
+        $this->encryption['key'] = $key;
+        return $this;
+    }
+
+    /**
+     * Get the encryption key
+     *
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->encryption['key'];
+    }
+
     /**
      * Returns the compression
      *

diff --git a/test/DecryptTest.php b/test/DecryptTest.php
@@ -46,13 +46,26 @@ public function testBasicMcrypt()
         );
 
         $enc = $filter->getEncryption();
-        $filter->setVector('1234567890123456');
-        $this->assertEquals('ZendFramework', $enc['key']);
+        $filter->setKey('1234567890123456');
         foreach ($valuesExpected as $input => $output) {
             $this->assertNotEquals($output, $filter($input));
         }
     }
 
+    /**
+     * Ensures that the encryption works fine
+     */
+    public function testDecryptBlockCipher()
+    {
+        if (!extension_loaded('mcrypt')) {
+            $this->markTestSkipped('Mcrypt extension not installed');
+        }
+        $decrypt = new DecryptFilter(array('adapter' => 'BlockCipher', 'key' => 'testkey'));
+        $decrypt->setVector('1234567890123456890');
+        $decrypted = $decrypt->filter('ec133eb7460682b0020b736ad6d2ef14c35de0f1e5976330ae1dd096ef3b4cb7MTIzNDU2Nzg5MDEyMzQ1NoZvxY1JkeL6TnQP3ug5F0k=');
+        $this->assertEquals($decrypted, 'test');
+    }
+
     /**
      * Ensures that the filter follows expected behavior
      *

diff --git a/test/Encrypt/BlockCipherTest.php b/test/Encrypt/BlockCipherTest.php
@@ -58,14 +58,18 @@ public function testBasicBlockCipher()
      */
     public function testGetSetVector()
     {
+
         $filter = new BlockCipherEncryption(array('key' => 'testkey'));
-        $filter->setVector('testvect');
-        $this->assertEquals('testvect', $filter->getVector());
+        $filter->setVector('1234567890123456');
+        $this->assertEquals('1234567890123456', $filter->getVector());
+    }
 
+    public function testWrongSizeVector()
+    {
         $this->setExpectedException('\Zend\Filter\Exception\InvalidArgumentException');
-        $output = $filter->encrypt('test');
+        $filter = new BlockCipherEncryption(array('key' => 'testkey'));
+        $filter->setVector('testvect');
     }
-
     /**
      * Ensures that the filter allows default encryption
      *
@@ -74,13 +78,13 @@ public function testGetSetVector()
     public function testDefaultEncryption()
     {
         $filter = new BlockCipherEncryption(array('key' => 'testkey'));
-        $filter->setVector('testvect');
+        $filter->setVector('1234567890123456');
         $this->assertEquals(
-            array('key' => 'testkey',
-                  'algorithm' => 'aes',
-                  'vector' => 'testvect',
+            array('key'           => 'testkey',
+                  'algorithm'     => 'aes',
+                  'vector'        => '1234567890123456',
                   'key_iteration' => 5000,
-                  'hash' => 'sha256'),
+                  'hash'          => 'sha256'),
             $filter->getEncryption()
         );
     }
@@ -93,16 +97,16 @@ public function testDefaultEncryption()
     public function testGetSetEncryption()
     {
         $filter = new BlockCipherEncryption(array('key' => 'testkey'));
-        $filter->setVector('testvect');
+        $filter->setVector('1234567890123456');
         $filter->setEncryption(
             array('algorithm' => '3des')
         );
         $this->assertEquals(
-            array('key' => 'testkey',
-                  'algorithm' => '3des',
-                  'vector' => 'testvect',
+            array('key'           => 'testkey',
+                  'algorithm'     => '3des',
+                  'vector'        => '1234567890123456',
                   'key_iteration' => 5000,
-                  'hash' => 'sha256'),
+                  'hash'          => 'sha256'),
             $filter->getEncryption()
         );
     }

diff --git a/test/EncryptTest.php b/test/EncryptTest.php
@@ -53,6 +53,20 @@ public function testBasicBlockCipher()
         }
     }
 
+    /**
+     * Ensures that the encryption works fine
+     */
+    public function testEncryptBlockCipher()
+    {
+        if (!extension_loaded('mcrypt')) {
+            $this->markTestSkipped('Mcrypt extension not installed');
+        }
+        $encrypt = new EncryptFilter(array('adapter' => 'BlockCipher', 'key' => 'testkey'));
+        $encrypt->setVector('1234567890123456890');
+        $encrypted = $encrypt->filter('test');
+        $this->assertEquals($encrypted, 'ec133eb7460682b0020b736ad6d2ef14c35de0f1e5976330ae1dd096ef3b4cb7MTIzNDU2Nzg5MDEyMzQ1NoZvxY1JkeL6TnQP3ug5F0k=');
+    }
+
     /**
      * Ensures that the filter follows expected behavior
      *

diff --git a/test/File/DecryptTest.php b/test/File/DecryptTest.php
@@ -61,7 +61,7 @@ public function testBasic()
             dirname(__DIR__).'/_files/newencryption.txt',
             $filter->getFilename());
 
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
         $filter->filter(dirname(__DIR__).'/_files/encryption.txt');
 
         $filter = new FileDecrypt();
@@ -70,7 +70,7 @@ public function testBasic()
             'Encryption',
             file_get_contents(dirname(__DIR__).'/_files/newencryption.txt'));
 
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
         $this->assertEquals(
             dirname(__DIR__).'/_files/newencryption.txt',
             $filter->filter(dirname(__DIR__).'/_files/newencryption.txt'));
@@ -116,7 +116,7 @@ public function testEncryptionWithDecryption()
     {
         $filter = new FileEncrypt();
         $filter->setFilename(dirname(__DIR__).'/_files/newencryption.txt');
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
         $this->assertEquals(dirname(__DIR__).'/_files/newencryption.txt',
             $filter->filter(dirname(__DIR__).'/_files/encryption.txt'));
 
@@ -131,7 +131,7 @@ public function testEncryptionWithDecryption()
             dirname(__DIR__).'/_files/newencryption2.txt',
             $filter->getFilename());
 
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
         $input = $filter->filter(dirname(__DIR__).'/_files/newencryption.txt');
         $this->assertEquals(dirname(__DIR__).'/_files/newencryption2.txt', $input);
 

diff --git a/test/File/EncryptTest.php b/test/File/EncryptTest.php
@@ -53,7 +53,7 @@ public function testBasic()
             dirname(__DIR__).'/_files/newencryption.txt',
             $filter->getFilename());
 
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
         $this->assertEquals(dirname(__DIR__).'/_files/newencryption.txt',
             $filter->filter(dirname(__DIR__).'/_files/encryption.txt'));
 
@@ -97,7 +97,7 @@ public function testEncryptionWithDecryption()
     {
         $filter = new FileEncrypt();
         $filter->setFilename(dirname(__DIR__).'/_files/newencryption.txt');
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
         $this->assertEquals(dirname(__DIR__).'/_files/newencryption.txt',
             $filter->filter(dirname(__DIR__).'/_files/encryption.txt'));
 
@@ -106,7 +106,7 @@ public function testEncryptionWithDecryption()
             file_get_contents(dirname(__DIR__).'/_files/newencryption.txt'));
 
         $filter = new FileDecrypt();
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
         $input = $filter->filter(dirname(__DIR__).'/_files/newencryption.txt');
         $this->assertEquals(dirname(__DIR__).'/_files/newencryption.txt', $input);
 
@@ -121,7 +121,7 @@ public function testEncryptionWithDecryption()
     public function testNonExistingFile()
     {
         $filter = new FileEncrypt();
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
 
         $this->setExpectedException('\Zend\Filter\Exception\InvalidArgumentException', 'not found');
         echo $filter->filter(dirname(__DIR__).'/_files/nofile.txt');
@@ -133,7 +133,7 @@ public function testNonExistingFile()
     public function testEncryptionInSameFile()
     {
         $filter = new FileEncrypt();
-        $filter->setVector('1234567890123456');
+        $filter->setKey('1234567890123456');
 
         copy(dirname(__DIR__).'/_files/encryption.txt', dirname(__DIR__).'/_files/newencryption.txt');
         $filter->filter(dirname(__DIR__).'/_files/newencryption.txt');