Tests: add testBlowfish

Author: terrafrost

lib/mcrypt.php

@@ -313,7 +313,7 @@ function phpseclib_mcrypt_enc_get_key_size(Base $td)
 
         $backup = clone $td;
         $backup->setKeyLength(9999);
-        return $backup->getKeyLength();
+        return $backup->getKeyLength() >> 3;
     }
 
     /**
@@ -515,7 +515,7 @@ function phpseclib_mcrypt_generic_init(Base $td, $key, $iv)
             trigger_error('mcrypt_generic_init(): Key size is 0', E_USER_WARNING);
             return -3;
         }
-        $max_key_size = phpseclib_mcrypt_enc_get_key_size($td) >> 3;
+        $max_key_size = phpseclib_mcrypt_enc_get_key_size($td);
         if (strlen($key) > $max_key_size) {
             trigger_error('mcrypt_generic_init(): Key size too large; supplied length: ' . strlen($key) . ', max: ' . $max_key_size, E_USER_WARNING);
         }

tests/MCryptCompatTest.php

@@ -278,4 +278,16 @@ public function testShortKeyIVStream()
 
         $this->assertEquals($mcrypt, $compat);
     }
+
+    public function testBlowfish()
+    {
+        $key = str_repeat('z', phpseclib_mcrypt_module_get_algo_key_size('blowfish'));
+        $iv = str_repeat('z', phpseclib_mcrypt_module_get_algo_block_size('blowfish'));
+
+        $plaintext = str_repeat('a', 100);
+
+        $mcrypt = mcrypt_encrypt('blowfish', $key, $plaintext, 'cbc', $iv);
+        $compat = phpseclib_mcrypt_encrypt('blowfish', $key, $plaintext, 'cbc', $iv);
+        $this->assertEquals(bin2hex($mcrypt), bin2hex($compat));
+    }
 }