Merge branch '1.0' into 2.0

Author: terrafrost

lib/mcrypt.php

@@ -338,6 +338,8 @@ function phpseclib_mcrypt_module_open($algorithm, $algorithm_directory, $mode, $
 
         $cipher->disablePadding();
 
+        $cipher->key = null;
+
         return $cipher;
     }
 
@@ -677,7 +679,6 @@ function phpseclib_mcrypt_generic_init(Base $td, $key, $iv)
         phpseclib_set_iv($td, $iv);
 
         $td->enableContinuousBuffer();
-        $td->mcrypt_polyfill_init = true;
 
         return 0;
     }
@@ -699,7 +700,7 @@ function phpseclib_mcrypt_generic_helper(Base $td, &$data, $op)
         // Warning: mcrypt_generic(): supplied resource is not a valid MCrypt resource
         // that error doesn't really make a lot of sense in this context since $td is not a resource nor should it be one.
         // in light of that we'll just display the same error that you get when you don't call mcrypt_generic_init() at all
-        if (!isset($td->mcrypt_polyfill_init)) {
+        if (!isset($td->key)) {
             trigger_error('m' . $op . '_generic(): Operation disallowed prior to mcrypt_generic_init().', E_USER_WARNING);
             return false;
         }
@@ -775,13 +776,13 @@ function phpseclib_mdecrypt_generic(Base $td, $data)
      */
     function phpseclib_mcrypt_generic_deinit(Base $td)
     {
-        if (!isset($td->mcrypt_polyfill_init)) {
+        if (!isset($td->key)) {
             trigger_error('mcrypt_generic_deinit(): Could not terminate encryption specifier', E_USER_WARNING);
             return false;
         }
 
         $td->disableContinuousBuffer();
-        unset($td->mcrypt_polyfill_init);
+        $td->key = null;
         return true;
     }
 
@@ -796,7 +797,7 @@ function phpseclib_mcrypt_generic_deinit(Base $td)
      */
     function phpseclib_mcrypt_module_close(Base $td)
     {
-        //unset($td->mcrypt_polyfill_init);
+        $td->key = null;
         return true;
     }
 

tests/MCryptCompatTest.php

@@ -1021,6 +1021,14 @@ public function testOFB()
         }
     }
 
+    public function testModuleOpenWithoutInit()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error_Warning');
+
+        $td = phpseclib_mcrypt_module_open('rijndael-128', '', 'cbc', '');
+        $result = phpseclib_mcrypt_generic($td, 'zzz');
+    }
+
     public function mcryptModuleNameProvider()
     {
         return array(