Merge branch 'imel96-zf5256' into develop

src/Symmetric/Mcrypt.php

@@ -219,20 +219,33 @@ public function getKeySize()
 
     /**
      * Set the encryption key
+     * If the key is longer than maximum supported, it will be truncated by getKey().
      *
      * @param  string                             $key
      * @throws Exception\InvalidArgumentException
      * @return Mcrypt
      */
     public function setKey($key)
     {
-        if (empty($key)) {
+        $keyLen = strlen($key);
+
+        if (!$keyLen) {
             throw new Exception\InvalidArgumentException('The key cannot be empty');
         }
-        if (strlen($key) < $this->getKeySize()) {
-             throw new Exception\InvalidArgumentException(
-                'The size of the key must be at least of ' . $this->getKeySize() . ' bytes'
-             );
+        $keySizes = mcrypt_module_get_supported_key_sizes($this->supportedAlgos[$this->algo]);
+        $maxKey = $this->getKeySize();
+
+        /*
+         * blowfish has $keySizes empty, meaning it can have arbitrary key length.
+         * the others are more picky.
+         */
+        if (!empty($keySizes) && $keyLen < $maxKey) {
+
+            if (!in_array($keyLen, $keySizes)) {
+                 throw new Exception\InvalidArgumentException(
+                    "The size of the key must be one of "
+                    . implode(", ", $keySizes) . " bytes or longer");
+            }
         }
         $this->key = $key;
 

test/Symmetric/McryptTest.php

@@ -113,9 +113,20 @@ public function testSetEmptyKey()
 
     public function testSetShortKey()
     {
-        $this->setExpectedException('Zend\Crypt\Symmetric\Exception\InvalidArgumentException');
-        $result = $this->mcrypt->setKey('short');
-        $output = $this->mcrypt->encrypt('test');
+        foreach ($this->mcrypt->getSupportedAlgorithms() as $algo) {
+            $this->mcrypt->setAlgorithm($algo);
+            try {
+                $result = $this->mcrypt->setKey('four');
+            } catch (\Exception $ex) {
+                $result = $ex;
+            }
+            if ($algo != 'blowfish') {
+                $this->assertInstanceOf('Zend\Crypt\Symmetric\Exception\InvalidArgumentException',
+                    $result);
+            } else {
+                $this->assertInstanceof('Zend\Crypt\Symmetric\Mcrypt', $result);
+            }
+        }
     }
 
     public function testSetSalt()