diff --git a/hphp/test/zend/bad/ext-mcrypt/bug55169.php b/hphp/test/zend/bad/ext-mcrypt/bug55169.php
new file mode 100644
index 000000000..061583050
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/bug55169.php
@@ -0,0 +1,9 @@
+<?php
+for( $i=1; $i<=64; $i = $i*2 ){
+  echo 'Input: '. $i . PHP_EOL;
+  $random = mcrypt_create_iv( $i, MCRYPT_DEV_URANDOM );
+  echo ' Length: ' . strlen( $random ) . PHP_EOL;
+  echo ' Hex: '. bin2hex( $random ) . PHP_EOL;
+  echo PHP_EOL;
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/bug55169.php.expectf b/hphp/test/zend/bad/ext-mcrypt/bug55169.php.expectf
new file mode 100644
index 000000000..0f5ff723f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/bug55169.php.expectf
@@ -0,0 +1,27 @@
+Input: 1
+ Length: 1
+ Hex: %x
+
+Input: 2
+ Length: 2
+ Hex: %x
+
+Input: 4
+ Length: 4
+ Hex: %x
+
+Input: 8
+ Length: 8
+ Hex: %x
+
+Input: 16
+ Length: 16
+ Hex: %x
+
+Input: 32
+ Length: 32
+ Hex: %x
+
+Input: 64
+ Length: 64
+ Hex: %x
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation1.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation1.php
new file mode 100644
index 000000000..797e216ce
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation1.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_cbc(string cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$key = b'string_val';
+$data = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+$iv = b'string_val';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for cipher
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( mcrypt_cbc($value, $key, $data, $mode, $iv) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation1.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation1.php.expectf
new file mode 100644
index 000000000..db2dbe467
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation1.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mcrypt_cbc() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--int indexed array--
+Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--associative array--
+Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--nested arrays--
+Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--uppercase NULL--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_cbc() expects parameter 1 to be string, object given, %s(%d)
+NULL
+
+--undefined var--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mcrypt_cbc() expects parameter 1 to be string, resource given, %s(%d)
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation2.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation2.php
new file mode 100644
index 000000000..c550c6af8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation2.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_cbc(string cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$data = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for key
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_cbc($cipher, $value, $data, $mode, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation2.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation2.php.expectf
new file mode 100644
index 000000000..6e4d842e0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation2.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_cbc() : usage variation ***
+
+--int 0--
+string(32) "bc27b3a4e33b531d5983fc7df693cd09"
+
+--int 1--
+string(32) "bc27b3a4e33b531d5983fc7df693cd09"
+
+--int 12345--
+string(32) "d109b7973383127002474ae731c4b3a8"
+
+--int -12345--
+string(32) "3e82a931cedb03a38b91a637ff8c9f9e"
+
+--float 10.5--
+string(32) "de71833586c1d7132a289960ebeeca7a"
+
+--float -10.5--
+string(32) "7d0489dd2e99ae910ecc015573f3dd16"
+
+--float 12.3456789000e10--
+string(32) "978055b42c0506a8947e3c3c8d994baf"
+
+--float -12.3456789000e10--
+string(32) "4aa84ba400c2b8ef467d4d98372b4f4e"
+
+--float .5--
+string(32) "e731dc5059b84e0c8774ac490f77d6e6"
+
+--empty array--
+Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--lowercase null--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--lowercase true--
+string(32) "bc27b3a4e33b531d5983fc7df693cd09"
+
+--lowercase false--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--uppercase TRUE--
+string(32) "bc27b3a4e33b531d5983fc7df693cd09"
+
+--uppercase FALSE--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--empty string DQ--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--empty string SQ--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--instance of classWithToString--
+string(32) "19420fa26f561ee82ed84abbcd2d284b"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_cbc() expects parameter 2 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--unset var--
+string(32) "be722a5ffc361d721fbcab1eacc6acf5"
+
+--resource--
+Error: 2 - mcrypt_cbc() expects parameter 2 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation3.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation3.php
new file mode 100644
index 000000000..ab1d73c1b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation3.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_cbc(string cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for data
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_cbc($cipher, $key, $value, $mode, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation3.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation3.php.expectf
new file mode 100644
index 000000000..e96879f4a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation3.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_cbc() : usage variation ***
+
+--int 0--
+string(16) "ce5fcfe737859795"
+
+--int 1--
+string(16) "84df495f6cd82dd9"
+
+--int 12345--
+string(16) "905ab1ae27ee9991"
+
+--int -12345--
+string(16) "5835174e9c67c3e7"
+
+--float 10.5--
+string(16) "28ff0601ad9e47fa"
+
+--float -10.5--
+string(16) "ce9f2b6e2fc3d9f7"
+
+--float 12.3456789000e10--
+string(32) "24eb882ce9763e4018fba9b7f01b0c3e"
+
+--float -12.3456789000e10--
+string(32) "5eed30e428f32de1d7a7064d0ed4d3eb"
+
+--float .5--
+string(16) "bebf2a13676e1e30"
+
+--empty array--
+Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(16) "206f6d3617a5ab32"
+
+--lowercase null--
+string(16) "206f6d3617a5ab32"
+
+--lowercase true--
+string(16) "84df495f6cd82dd9"
+
+--lowercase false--
+string(16) "206f6d3617a5ab32"
+
+--uppercase TRUE--
+string(16) "84df495f6cd82dd9"
+
+--uppercase FALSE--
+string(16) "206f6d3617a5ab32"
+
+--empty string DQ--
+string(16) "206f6d3617a5ab32"
+
+--empty string SQ--
+string(16) "206f6d3617a5ab32"
+
+--instance of classWithToString--
+string(32) "7c91cdf8f8c51485034a9ee528eb016b"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_cbc() expects parameter 3 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(16) "206f6d3617a5ab32"
+
+--unset var--
+string(16) "206f6d3617a5ab32"
+
+--resource--
+Error: 2 - mcrypt_cbc() expects parameter 3 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation5.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation5.php
new file mode 100644
index 000000000..442691aea
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation5.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_cbc(string cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for iv
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( bin2hex(mcrypt_cbc($cipher, $key, $data, $mode, $value)) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation5.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation5.php.expectf
new file mode 100644
index 000000000..92a4bd27b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_cbc_variation5.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mcrypt_cbc() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--int 1--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--int 12345--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--int -12345--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float 10.5--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float -10.5--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float .5--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--empty array--
+Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--lowercase null--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--lowercase true--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--lowercase false--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--uppercase TRUE--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--uppercase FALSE--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--empty string DQ--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--empty string SQ--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--instance of classWithToString--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_cbc() expects parameter 5 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--unset var--
+Error: 2 - mcrypt_cbc(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--resource--
+Error: 2 - mcrypt_cbc() expects parameter 5 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation1.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation1.php
new file mode 100644
index 000000000..04f322398
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation1.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$key = b'string_val';
+$data = b'string_val';
+$mode = MCRYPT_MODE_ECB;
+$iv = b'string_val';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for cipher
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( mcrypt_decrypt($value, $key, $data, $mode, $iv) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation1.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation1.php.expectf
new file mode 100644
index 000000000..54cf5d3e3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation1.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mcrypt_decrypt() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--int indexed array--
+Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--associative array--
+Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--nested arrays--
+Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--uppercase NULL--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, object given, %s(%d)
+NULL
+
+--undefined var--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, resource given, %s(%d)
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation2.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation2.php
new file mode 100644
index 000000000..435cd1a7e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation2.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$data = b'string_val';
+$mode = MCRYPT_MODE_ECB;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for key
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( bin2hex(mcrypt_decrypt($cipher, $value, $data, $mode, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation2.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation2.php.expectf
new file mode 100644
index 000000000..dd245f49e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation2.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_decrypt() : usage variation ***
+
+--int 0--
+string(32) "43a1ae011df36064589d06bc922ecd97"
+
+--int 1--
+string(32) "43a1ae011df36064589d06bc922ecd97"
+
+--int 12345--
+string(32) "e5885552e16c44d4eb6164f477b40200"
+
+--int -12345--
+string(32) "adf7873831a9035cda9f9dc3b7dc626b"
+
+--float 10.5--
+string(32) "08b0b9fac9c227437b7b5d0147e6153b"
+
+--float -10.5--
+string(32) "f470cc74d83471b42a3e28d4ec57799a"
+
+--float 12.3456789000e10--
+string(32) "36c618c00523fadc372b871eaa9c7b16"
+
+--float -12.3456789000e10--
+string(32) "a554a5bdb7a5ceb6ae6f20566ef02e49"
+
+--float .5--
+string(32) "bcb840ff76d3788a7911ed36f088a910"
+
+--empty array--
+Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--lowercase null--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--lowercase true--
+string(32) "43a1ae011df36064589d06bc922ecd97"
+
+--lowercase false--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--uppercase TRUE--
+string(32) "43a1ae011df36064589d06bc922ecd97"
+
+--uppercase FALSE--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--empty string DQ--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--empty string SQ--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--instance of classWithToString--
+string(32) "478f9d080563835cc3136610802f1433"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--unset var--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--resource--
+Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation3.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation3.php
new file mode 100644
index 000000000..c25131fab
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation3.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$mode = MCRYPT_MODE_ECB;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for data
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_decrypt($cipher, $key, $value, $mode, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation3.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation3.php.expectf
new file mode 100644
index 000000000..25e1df2fd
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation3.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_decrypt() : usage variation ***
+
+--int 0--
+string(16) "52833a00168e547f"
+
+--int 1--
+string(16) "82011a0a93098a13"
+
+--int 12345--
+string(16) "e8b71c21b6acc162"
+
+--int -12345--
+string(16) "db3c458e975563a8"
+
+--float 10.5--
+string(16) "6ee8764562f25913"
+
+--float -10.5--
+string(16) "d63b39fd5f65678e"
+
+--float 12.3456789000e10--
+string(32) "7712cc4828221be40672239d9c32e742"
+
+--float -12.3456789000e10--
+string(32) "caa892cb5d28b53c2b75b1e0799427c3"
+
+--float .5--
+string(16) "99880c86884385d9"
+
+--empty array--
+Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(16) "d27689f6fd9700f4"
+
+--lowercase null--
+string(16) "d27689f6fd9700f4"
+
+--lowercase true--
+string(16) "82011a0a93098a13"
+
+--lowercase false--
+string(16) "d27689f6fd9700f4"
+
+--uppercase TRUE--
+string(16) "82011a0a93098a13"
+
+--uppercase FALSE--
+string(16) "d27689f6fd9700f4"
+
+--empty string DQ--
+string(16) "d27689f6fd9700f4"
+
+--empty string SQ--
+string(16) "d27689f6fd9700f4"
+
+--instance of classWithToString--
+string(32) "46677e368bc07ef375bd580e0c4b2594"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(16) "d27689f6fd9700f4"
+
+--unset var--
+string(16) "d27689f6fd9700f4"
+
+--resource--
+Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation4.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation4.php
new file mode 100644
index 000000000..268cc418f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation4.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for mode
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( mcrypt_decrypt($cipher, $key, $data, $value, $iv) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation4.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation4.php.expectf
new file mode 100644
index 000000000..13899905b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation4.php.expectf
@@ -0,0 +1,112 @@
+*** Testing mcrypt_decrypt() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty array--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--associative array--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 4096 - Object of class classWithoutToString could not be converted to string, %s(%d)
+Error: 8 - Object of class classWithoutToString to string conversion, %s(%d)
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation5.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation5.php
new file mode 100644
index 000000000..99d090e22
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation5.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+$mode = MCRYPT_MODE_CBC;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for iv
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_decrypt($cipher, $key, $data, $mode, $value)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation5.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation5.php.expectf
new file mode 100644
index 000000000..8ed43f2e5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_decrypt_variation5.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mcrypt_decrypt() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--int 1--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--int 12345--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--int -12345--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--float 10.5--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--float -10.5--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--float .5--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--empty array--
+Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--lowercase null--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--lowercase true--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--lowercase false--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--uppercase TRUE--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--uppercase FALSE--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--empty string DQ--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--empty string SQ--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--instance of classWithToString--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--unset var--
+Error: 2 - mcrypt_decrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "a80c6cef6b42c875e2372a0339dc22b0"
+
+--resource--
+Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation1.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation1.php
new file mode 100644
index 000000000..be15193af
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation1.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_ecb(string cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$key = b'string_val';
+$data = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+$iv = b'string_val';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for cipher
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( mcrypt_ecb($value, $key, $data, $mode, $iv) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation1.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation1.php.expectf
new file mode 100644
index 000000000..a98cf4127
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation1.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mcrypt_ecb() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--int indexed array--
+Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--associative array--
+Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--nested arrays--
+Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--uppercase NULL--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_ecb() expects parameter 1 to be string, object given, %s(%d)
+NULL
+
+--undefined var--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mcrypt_ecb() expects parameter 1 to be string, resource given, %s(%d)
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation2.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation2.php
new file mode 100644
index 000000000..7279c92c1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation2.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_ecb(string cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$data = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for key
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_ecb($cipher, $value, $data, $mode, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation2.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation2.php.expectf
new file mode 100644
index 000000000..e38083f49
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation2.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_ecb() : usage variation ***
+
+--int 0--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--int 1--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--int 12345--
+string(32) "d74e5f51d1199bcfa61f80168e913007"
+
+--int -12345--
+string(32) "17fe485ed735abb34c1dd4455af7b79c"
+
+--float 10.5--
+string(32) "cd735509aa4013a130e011686d66ae01"
+
+--float -10.5--
+string(32) "a57d99d6d5813039abf50fc50d631e47"
+
+--float 12.3456789000e10--
+string(32) "f17ede0bfdaa4408f545f7f4c8b040d2"
+
+--float -12.3456789000e10--
+string(32) "326f64e3b9bd5a6beb0a9b52a09a5a48"
+
+--float .5--
+string(32) "2aedf7661cd4d8c7593f44c58718e2b8"
+
+--empty array--
+Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--lowercase null--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--lowercase true--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--lowercase false--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--uppercase TRUE--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--uppercase FALSE--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--empty string DQ--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--empty string SQ--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--instance of classWithToString--
+string(32) "1fd3514d8ced44d04d9dc7511fce33ef"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_ecb() expects parameter 2 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--unset var--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--resource--
+Error: 2 - mcrypt_ecb() expects parameter 2 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation3.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation3.php
new file mode 100644
index 000000000..65d43f229
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation3.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_ecb(string cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for data
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_ecb($cipher, $key, $value, $mode, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation3.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation3.php.expectf
new file mode 100644
index 000000000..f248445a4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation3.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_ecb() : usage variation ***
+
+--int 0--
+string(16) "51dc9cd9179b718b"
+
+--int 1--
+string(16) "619c335f8c4f9cbf"
+
+--int 12345--
+string(16) "b1258d67ab73de00"
+
+--int -12345--
+string(16) "8eecf134443bd6b9"
+
+--float 10.5--
+string(16) "34b5750a793baff5"
+
+--float -10.5--
+string(16) "7a605f2aacc8a11d"
+
+--float 12.3456789000e10--
+string(32) "74a0d7026ae586f476d4b17808851e86"
+
+--float -12.3456789000e10--
+string(32) "bfb155997017986c01090afebd62c7ca"
+
+--float .5--
+string(16) "cc60ac201164b6c7"
+
+--empty array--
+Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(16) "6ece228c41457539"
+
+--lowercase null--
+string(16) "6ece228c41457539"
+
+--lowercase true--
+string(16) "619c335f8c4f9cbf"
+
+--lowercase false--
+string(16) "6ece228c41457539"
+
+--uppercase TRUE--
+string(16) "619c335f8c4f9cbf"
+
+--uppercase FALSE--
+string(16) "6ece228c41457539"
+
+--empty string DQ--
+string(16) "6ece228c41457539"
+
+--empty string SQ--
+string(16) "6ece228c41457539"
+
+--instance of classWithToString--
+string(32) "749c3b4d16731d98370128754b7c930f"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_ecb() expects parameter 3 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(16) "6ece228c41457539"
+
+--unset var--
+string(16) "6ece228c41457539"
+
+--resource--
+Error: 2 - mcrypt_ecb() expects parameter 3 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation5.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation5.php
new file mode 100644
index 000000000..01902c83e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation5.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_ecb(string cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+$mode = MCRYPT_ENCRYPT;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for iv
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex( mcrypt_ecb($cipher, $key, $data, $mode, $value)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation5.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation5.php.expectf
new file mode 100644
index 000000000..3b4a01c94
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_ecb_variation5.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_ecb() : usage variation ***
+
+--int 0--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--int 1--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--int 12345--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--int -12345--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--float 10.5--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--float -10.5--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--float 12.3456789000e10--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--float -12.3456789000e10--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--float .5--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--empty array--
+Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--lowercase null--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--lowercase true--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--lowercase false--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--uppercase TRUE--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--uppercase FALSE--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--empty string DQ--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--empty string SQ--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--instance of classWithToString--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_ecb() expects parameter 5 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--unset var--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--resource--
+Error: 2 - mcrypt_ecb() expects parameter 5 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation1.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation1.php
new file mode 100644
index 000000000..1e043ce0c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation1.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$key = b'string_val';
+$data = b'string_val';
+$mode = MCRYPT_MODE_ECB;
+$iv = b'string_val';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for cipher
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( mcrypt_encrypt($value, $key, $data, $mode, $iv) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation1.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation1.php.expectf
new file mode 100644
index 000000000..2ba325ec1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation1.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mcrypt_encrypt() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--int indexed array--
+Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--associative array--
+Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--nested arrays--
+Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--uppercase NULL--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, object given, %s(%d)
+NULL
+
+--undefined var--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, resource given, %s(%d)
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation2.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation2.php
new file mode 100644
index 000000000..8d35bb42b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation2.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$data = b'string_val';
+$mode = MCRYPT_MODE_ECB;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for key
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( bin2hex(mcrypt_encrypt($cipher, $value, $data, $mode, $iv) ));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation2.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation2.php.expectf
new file mode 100644
index 000000000..faf252e84
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation2.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_encrypt() : usage variation ***
+
+--int 0--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--int 1--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--int 12345--
+string(32) "d74e5f51d1199bcfa61f80168e913007"
+
+--int -12345--
+string(32) "17fe485ed735abb34c1dd4455af7b79c"
+
+--float 10.5--
+string(32) "cd735509aa4013a130e011686d66ae01"
+
+--float -10.5--
+string(32) "a57d99d6d5813039abf50fc50d631e47"
+
+--float 12.3456789000e10--
+string(32) "f17ede0bfdaa4408f545f7f4c8b040d2"
+
+--float -12.3456789000e10--
+string(32) "326f64e3b9bd5a6beb0a9b52a09a5a48"
+
+--float .5--
+string(32) "2aedf7661cd4d8c7593f44c58718e2b8"
+
+--empty array--
+Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--lowercase null--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--lowercase true--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--lowercase false--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--uppercase TRUE--
+string(32) "e469e6b066f9600e1eefd8f53365f96c"
+
+--uppercase FALSE--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--empty string DQ--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--empty string SQ--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--instance of classWithToString--
+string(32) "1fd3514d8ced44d04d9dc7511fce33ef"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--unset var--
+string(32) "bfa2cb7240c8d2f6abeb34960c04f6d3"
+
+--resource--
+Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation3.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation3.php
new file mode 100644
index 000000000..bbce10a93
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation3.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$mode = MCRYPT_MODE_ECB;
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for data
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( bin2hex(mcrypt_encrypt($cipher, $key, $value, $mode, $iv) ));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation3.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation3.php.expectf
new file mode 100644
index 000000000..cdf124944
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation3.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mcrypt_encrypt() : usage variation ***
+
+--int 0--
+string(16) "51dc9cd9179b718b"
+
+--int 1--
+string(16) "619c335f8c4f9cbf"
+
+--int 12345--
+string(16) "b1258d67ab73de00"
+
+--int -12345--
+string(16) "8eecf134443bd6b9"
+
+--float 10.5--
+string(16) "34b5750a793baff5"
+
+--float -10.5--
+string(16) "7a605f2aacc8a11d"
+
+--float 12.3456789000e10--
+string(32) "74a0d7026ae586f476d4b17808851e86"
+
+--float -12.3456789000e10--
+string(32) "bfb155997017986c01090afebd62c7ca"
+
+--float .5--
+string(16) "cc60ac201164b6c7"
+
+--empty array--
+Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+string(16) "6ece228c41457539"
+
+--lowercase null--
+string(16) "6ece228c41457539"
+
+--lowercase true--
+string(16) "619c335f8c4f9cbf"
+
+--lowercase false--
+string(16) "6ece228c41457539"
+
+--uppercase TRUE--
+string(16) "619c335f8c4f9cbf"
+
+--uppercase FALSE--
+string(16) "6ece228c41457539"
+
+--empty string DQ--
+string(16) "6ece228c41457539"
+
+--empty string SQ--
+string(16) "6ece228c41457539"
+
+--instance of classWithToString--
+string(32) "749c3b4d16731d98370128754b7c930f"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+string(16) "6ece228c41457539"
+
+--unset var--
+string(16) "6ece228c41457539"
+
+--resource--
+Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation4.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation4.php
new file mode 100644
index 000000000..1c5a8b0e5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation4.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for mode
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( mcrypt_encrypt($cipher, $key, $data, $value, $iv) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation4.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation4.php.expectf
new file mode 100644
index 000000000..9e71c6baf
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation4.php.expectf
@@ -0,0 +1,112 @@
+*** Testing mcrypt_encrypt() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty array--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--associative array--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 8 - Array to string conversion, %s(%d)
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 4096 - Object of class classWithoutToString could not be converted to string, %s(%d)
+Error: 8 - Object of class classWithoutToString to string conversion, %s(%d)
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation5.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation5.php
new file mode 100644
index 000000000..311f78aa1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation5.php
@@ -0,0 +1,114 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+//in php, it incorrectly reports problems with iv in ECB mode.
+$mode = MCRYPT_MODE_CBC;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for iv
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump( bin2hex(mcrypt_encrypt($cipher, $key, $data, $mode, $value)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation5.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation5.php.expectf
new file mode 100644
index 000000000..070b4bffe
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_encrypt_variation5.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mcrypt_encrypt() : usage variation ***
+
+--int 0--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--int 1--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--int 12345--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--int -12345--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float 10.5--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float -10.5--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float 12.3456789000e10--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float -12.3456789000e10--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--float .5--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--empty array--
+Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--int indexed array--
+Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--associative array--
+Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--nested arrays--
+Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
+string(0) ""
+
+--uppercase NULL--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--lowercase null--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--lowercase true--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--lowercase false--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--uppercase TRUE--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--uppercase FALSE--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--empty string DQ--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--empty string SQ--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--instance of classWithToString--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--instance of classWithoutToString--
+Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, object given, %s(%d)
+string(0) ""
+
+--undefined var--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--unset var--
+Error: 2 - mcrypt_encrypt(): The IV parameter must be as long as the blocksize, %s(%d)
+string(32) "6438db90653c4d3080c3ceab43618c05"
+
+--resource--
+Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, resource given, %s(%d)
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_filters.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_filters.php
new file mode 100644
index 000000000..10a5975e0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_filters.php
@@ -0,0 +1,30 @@
+<?php
+foreach (stream_get_filters() as $f) {
+	if ($f == "mcrypt.*" || $f == "mdecrypt.*") {
+	   echo "FOUND\n";
+	}
+}
+
+$secretfile = 'secert-file.tmp';
+$passphrase = 'My secret';
+
+$iv = substr(md5('iv'.$passphrase, true), 0, 8);
+$key = substr(md5('pass1'.$passphrase, true) . 
+               md5('pass2'.$passphrase, true), 0, 24);
+$opts = array('iv'=>$iv, 'key'=>$key);
+
+$fp = fopen($secretfile, 'wb');
+stream_filter_append($fp, 'mcrypt.tripledes', STREAM_FILTER_WRITE, $opts);
+fwrite($fp, 'Secret secret secret data');
+fclose($fp);
+
+echo md5_file($secretfile)."\n";
+
+$fp = fopen($secretfile, 'rb');
+stream_filter_append($fp, 'mdecrypt.tripledes', STREAM_FILTER_READ, $opts);
+$data = stream_get_contents($fp);
+fclose($fp);
+
+echo $data."\n";
+
+@unlink($secretfile);
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_filters.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_filters.php.expectf
new file mode 100644
index 000000000..d6d70d3a6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_filters.php.expectf
@@ -0,0 +1,4 @@
+FOUND
+FOUND
+32e14bd3c31f2bd666e4290ebdb166a7
+Secret secret secret data
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_module_open.php b/hphp/test/zend/bad/ext-mcrypt/mcrypt_module_open.php
new file mode 100644
index 000000000..de577b4b4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_module_open.php
@@ -0,0 +1,3 @@
+<?php
+var_dump(mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, ''));
+mcrypt_module_open('', '', '', '');
diff --git a/hphp/test/zend/bad/ext-mcrypt/mcrypt_module_open.php.expectf b/hphp/test/zend/bad/ext-mcrypt/mcrypt_module_open.php.expectf
new file mode 100644
index 000000000..201da87d7
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mcrypt/mcrypt_module_open.php.expectf
@@ -0,0 +1,2 @@
+resource(%d) of type (mcrypt)
+HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/blowfish.php b/hphp/test/zend/good/ext-mcrypt/blowfish.php
new file mode 100644
index 000000000..f5893e838
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/blowfish.php
@@ -0,0 +1,49 @@
+<?php
+if(!function_exists("hex2bin")) {
+    function hex2bin($data) {
+       $len = strlen($data);
+       return pack("H" . $len, $data);
+    }   
+}
+
+print "key               plain             crypt             guess             stat\n";
+$null = "\0\0\0\0\0\0\0\0";
+$vectors = file(dirname(__FILE__) . "/vectors.txt");
+
+$td = mcrypt_module_open ("blowfish", "", MCRYPT_MODE_ECB, "");
+
+foreach($vectors as $data) {
+    $data = trim($data);
+    if ($data) {
+        list($key,$plain,$crypt) = preg_split("/[[:space:]]+/",$data);
+        printf("%s  %s  ",
+            $key,
+            $plain
+        );  
+        $key = hex2bin(trim($key));
+        $plain = hex2bin(($plain));
+        $crypt = strtolower(trim($crypt));
+
+        mcrypt_generic_init ($td, $key, $null);
+        $guess = mcrypt_generic ($td, $plain);
+        $guess = bin2hex($guess);
+        printf("%s  %s  %s\n",
+            $crypt,
+            $guess,
+            ($crypt==$guess ? "OK" : "BAD")
+        );  
+    }   
+}
+
+// Longer test case from http://www.schneier.com/code/vectors.txt
+$td = mcrypt_module_open ("blowfish", "", MCRYPT_MODE_CBC, "");
+
+$key = hex2bin( "0123456789ABCDEFF0E1D2C3B4A59687" );
+$iv = hex2bin( "FEDCBA9876543210" );
+$plain = hex2bin( "37363534333231204E6F77206973207468652074696D6520666F722000" );
+
+mcrypt_generic_init( $td, $key, $iv );
+$guess = bin2hex( mcrypt_generic( $td, $plain ) );
+
+echo "\n", $guess, "\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/blowfish.php.expectf b/hphp/test/zend/good/ext-mcrypt/blowfish.php.expectf
new file mode 100644
index 000000000..df907fa4e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/blowfish.php.expectf
@@ -0,0 +1,36 @@
+key               plain             crypt             guess             stat
+0000000000000000  0000000000000000  4ef997456198dd78  4ef997456198dd78  OK
+FFFFFFFFFFFFFFFF  FFFFFFFFFFFFFFFF  51866fd5b85ecb8a  51866fd5b85ecb8a  OK
+3000000000000000  1000000000000001  7d856f9a613063f2  7d856f9a613063f2  OK
+1111111111111111  1111111111111111  2466dd878b963c9d  2466dd878b963c9d  OK
+0123456789ABCDEF  1111111111111111  61f9c3802281b096  61f9c3802281b096  OK
+1111111111111111  0123456789ABCDEF  7d0cc630afda1ec7  7d0cc630afda1ec7  OK
+FEDCBA9876543210  0123456789ABCDEF  0aceab0fc6a0a28d  0aceab0fc6a0a28d  OK
+7CA110454A1A6E57  01A1D6D039776742  59c68245eb05282b  59c68245eb05282b  OK
+0131D9619DC1376E  5CD54CA83DEF57DA  b1b8cc0b250f09a0  b1b8cc0b250f09a0  OK
+07A1133E4A0B2686  0248D43806F67172  1730e5778bea1da4  1730e5778bea1da4  OK
+3849674C2602319E  51454B582DDF440A  a25e7856cf2651eb  a25e7856cf2651eb  OK
+04B915BA43FEB5B6  42FD443059577FA2  353882b109ce8f1a  353882b109ce8f1a  OK
+0113B970FD34F2CE  059B5E0851CF143A  48f4d0884c379918  48f4d0884c379918  OK
+0170F175468FB5E6  0756D8E0774761D2  432193b78951fc98  432193b78951fc98  OK
+43297FAD38E373FE  762514B829BF486A  13f04154d69d1ae5  13f04154d69d1ae5  OK
+07A7137045DA2A16  3BDD119049372802  2eedda93ffd39c79  2eedda93ffd39c79  OK
+04689104C2FD3B2F  26955F6835AF609A  d887e0393c2da6e3  d887e0393c2da6e3  OK
+37D06BB516CB7546  164D5E404F275232  5f99d04f5b163969  5f99d04f5b163969  OK
+1F08260D1AC2465E  6B056E18759F5CCA  4a057a3b24d3977b  4a057a3b24d3977b  OK
+584023641ABA6176  004BD6EF09176062  452031c1e4fada8e  452031c1e4fada8e  OK
+025816164629B007  480D39006EE762F2  7555ae39f59b87bd  7555ae39f59b87bd  OK
+49793EBC79B3258F  437540C8698F3CFA  53c55f9cb49fc019  53c55f9cb49fc019  OK
+4FB05E1515AB73A7  072D43A077075292  7a8e7bfa937e89a3  7a8e7bfa937e89a3  OK
+49E95D6D4CA229BF  02FE55778117F12A  cf9c5d7a4986adb5  cf9c5d7a4986adb5  OK
+018310DC409B26D6  1D9D5C5018F728C2  d1abb290658bc778  d1abb290658bc778  OK
+1C587F1C13924FEF  305532286D6F295A  55cb3774d13ef201  55cb3774d13ef201  OK
+0101010101010101  0123456789ABCDEF  fa34ec4847b268b2  fa34ec4847b268b2  OK
+1F1F1F1F0E0E0E0E  0123456789ABCDEF  a790795108ea3cae  a790795108ea3cae  OK
+E0FEE0FEF1FEF1FE  0123456789ABCDEF  c39e072d9fac631d  c39e072d9fac631d  OK
+0000000000000000  FFFFFFFFFFFFFFFF  014933e0cdaff6e4  014933e0cdaff6e4  OK
+FFFFFFFFFFFFFFFF  0000000000000000  f21e9a77b71c49bc  f21e9a77b71c49bc  OK
+0123456789ABCDEF  0000000000000000  245946885754369a  245946885754369a  OK
+FEDCBA9876543210  FFFFFFFFFFFFFFFF  6b5c5a9c5d9e0a5a  6b5c5a9c5d9e0a5a  OK
+
+6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5ff92cc
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug35496.php b/hphp/test/zend/good/ext-mcrypt/bug35496.php
new file mode 100644
index 000000000..7a64e251c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug35496.php
@@ -0,0 +1,5 @@
+<?php
+$td = mcrypt_module_open('rijndael-256', '', 'ofb', '');
+mcrypt_generic($td, "foobar");
+mdecrypt_generic($td, "baz");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug35496.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug35496.php.expectf
new file mode 100644
index 000000000..55529a618
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug35496.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %a
+HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug37595.php b/hphp/test/zend/good/ext-mcrypt/bug37595.php
new file mode 100644
index 000000000..8e1d83db2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug37595.php
@@ -0,0 +1,42 @@
+<?php
+
+$cipher_alg = MCRYPT_BLOWFISH;
+$skey = array(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
+$key='';
+foreach($skey as $t) {
+	    $key .= chr($t);
+		}
+ 
+$sstr = array(1,2,3,4,5,6,7,8);
+$iv='';
+foreach($sstr as $s) {
+    $iv .= chr($s);
+}
+ 
+$str = "12345678";
+ 
+$td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_CBC,'');
+ 
+$data = Array(
+	'12345678',
+	'123456789',
+	"\x001234567",
+	'',
+	'1234567812345678',
+	'12345678123456789'
+	);
+
+foreach ($data as $val) {
+	mcrypt_generic_init($td, $key, $iv);
+	$enc = mcrypt_generic($td, $val);
+	
+	mcrypt_generic_deinit($td);
+	
+	mcrypt_generic_init($td, $key, $iv);
+	var_dump($dec = @mdecrypt_generic($td, $enc));
+}
+
+mcrypt_module_close($td);
+
+echo "Done\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug37595.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug37595.php.expectf
new file mode 100644
index 000000000..84ae42f92
Binary files /dev/null and b/hphp/test/zend/good/ext-mcrypt/bug37595.php.expectf differ
diff --git a/hphp/test/zend/good/ext-mcrypt/bug41252.php b/hphp/test/zend/good/ext-mcrypt/bug41252.php
new file mode 100644
index 000000000..75fd8829b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug41252.php
@@ -0,0 +1,5 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_DES, '', MCRYPT_MODE_ECB, '');
+echo mcrypt_generic($td,'aaaaaaaa');
+print "I'm alive!\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug41252.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug41252.php.expectf
new file mode 100644
index 000000000..8cfa88e2f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug41252.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %a
+I'm alive!
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug43143.php b/hphp/test/zend/good/ext-mcrypt/bug43143.php
new file mode 100644
index 000000000..e5469657f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug43143.php
@@ -0,0 +1,11 @@
+<?php
+echo "ECB\n";
+$input = 'to be encrypted';
+$mkey = hash('sha256', 'secret key', TRUE);
+$data = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $mkey, $input, MCRYPT_MODE_ECB);
+echo "CFB\n";
+$input = 'to be encrypted';
+$mkey = hash('sha256', 'secret key', TRUE);
+$data = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $mkey, $input, MCRYPT_MODE_CFB);
+echo "END\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug43143.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug43143.php.expectf
new file mode 100644
index 000000000..56b0103e1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug43143.php.expectf
@@ -0,0 +1,4 @@
+ECB
+CFB
+HipHop Warning: %a
+END
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug46010.php b/hphp/test/zend/good/ext-mcrypt/bug46010.php
new file mode 100644
index 000000000..9ac56b952
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug46010.php
@@ -0,0 +1,7 @@
+<?php
+
+var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB)));
+var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB, "a")));
+var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB, "12345678")));
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug46010.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug46010.php.expectf
new file mode 100644
index 000000000..2d86e8d47
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug46010.php.expectf
@@ -0,0 +1,3 @@
+string(16) "372eeb4a524b8d31"
+string(16) "372eeb4a524b8d31"
+string(16) "372eeb4a524b8d31"
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug49738.php b/hphp/test/zend/good/ext-mcrypt/bug49738.php
new file mode 100644
index 000000000..c661a1ef3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug49738.php
@@ -0,0 +1,6 @@
+<?php
+   $td = mcrypt_module_open(MCRYPT_DES, '', MCRYPT_MODE_ECB, '');
+   mcrypt_generic_init($td, 'aaaaaaaa', 'aaaaaaaa');
+   mcrypt_generic_deinit($td);
+   echo mcrypt_generic($td, 'aaaaaaaa');
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug49738.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug49738.php.expectf
new file mode 100644
index 000000000..cfb6a8593
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug49738.php.expectf
@@ -0,0 +1 @@
+HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug8040.php b/hphp/test/zend/good/ext-mcrypt/bug8040.php
new file mode 100644
index 000000000..94972f1b1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug8040.php
@@ -0,0 +1,14 @@
+<?php
+	error_reporting (E_ALL ^ E_NOTICE);
+	echo MCRYPT_TWOFISH."\n";
+	echo MCRYPT_MODE_CBC."\n";
+
+	define ("MODE1", MCRYPT_MODE_CBC);
+	echo MODE1."\n";
+
+	define ("CIPHER", MCRYPT_TWOFISH);
+	define ("MODE2", MCRYPT_MODE_CBC);
+	define ("MODE3", MCRYPT_CBC);
+
+	printf ("cipher=".CIPHER. " mode1=".MODE2. " mode2=". MODE3."\n");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/bug8040.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug8040.php.expectf
new file mode 100644
index 000000000..19cbed5ae
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/bug8040.php.expectf
@@ -0,0 +1,4 @@
+twofish
+cbc
+cbc
+cipher=twofish mode1=cbc mode2=MCRYPT_CBC
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php
new file mode 100644
index 000000000..cc7191d88
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php
@@ -0,0 +1,13 @@
+<?php
+$key      = "FooBar";
+$secret   = "PHP Testfest 2008";
+$cipher   = MCRYPT_RIJNDAEL_128;
+
+$iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);
+$enc_data = mcrypt_cbc($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv);
+
+// we have to trim as AES rounds the blocks and decrypt doesnt detect that
+echo trim(mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . "\n";
+
+// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
+mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT);
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php.expectf
new file mode 100644
index 000000000..e96019298
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php.expectf
@@ -0,0 +1,2 @@
+PHP Testfest 2008
+HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php
new file mode 100644
index 000000000..79f66153c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php
@@ -0,0 +1,59 @@
+<?php
+/* Prototype  : string mcrypt_cbc(int cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : basic functionality ***\n";
+
+
+$cipher = MCRYPT_TRIPLEDES;
+$data = b"This is the secret message which must be encrypted";
+$mode = MCRYPT_DECRYPT;
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456'
+);
+$data1 = array(
+   'IleMhoxiOthmHua4tFBHOw==',
+   'EeF1s6C+w1IiHj1gdDn81g==',
+   'EEuXpjZPueyYoG0LGQ199Q==',
+   'EEuXpjZPueyYoG0LGQ199Q=='
+);
+// tripledes is a block cipher of 64 bits (8 bytes)
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789'
+);
+   // data represented in base64 (ascii)
+$data2 = array(
+   '+G7nGcWIxij3TZjpI9lJdQ==',
+   '3bJiFMeyScxOLQcE6mZtLg==',
+   '+G7nGcWIxij3TZjpI9lJdQ=='
+);
+
+$iv = b'12345678';
+echo "\n--- testing different key lengths\n";
+for ($i = 0; $i < sizeof($keys); $i++) {
+   echo "\nkey length=".strlen($keys[$i])."\n";
+   special_var_dump(mcrypt_cbc($cipher, $keys[$i], base64_decode($data1[$i]), $mode, $iv));
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+for ($i = 0; $i < sizeof($ivs); $i++) {
+   echo "\niv length=".strlen($ivs[$i])."\n";
+   special_var_dump(mcrypt_cbc($cipher, $key, base64_decode($data2[$i]), $mode, $ivs[$i]));
+}
+
+function special_var_dump($str) {
+   var_dump(bin2hex($str));
+}  
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php.expectf
new file mode 100644
index 000000000..4548da739
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php.expectf
@@ -0,0 +1,30 @@
+*** Testing mcrypt_cbc() : basic functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(32) "736563726574206d6573736167650000"
+
+key length=20
+string(32) "736563726574206d6573736167650000"
+
+key length=24
+string(32) "736563726574206d6573736167650000"
+
+key length=26
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+
+--- testing different iv lengths
+
+iv length=4
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+
+iv length=8
+string(32) "736563726574206d6573736167650000"
+
+iv length=9
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_encrypt.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_encrypt.php
new file mode 100644
index 000000000..d8690aa6c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_encrypt.php
@@ -0,0 +1,42 @@
+<?php
+/* Prototype  : string mcrypt_cbc(int cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : basic functionality ***\n";
+
+
+$cipher = MCRYPT_TRIPLEDES;
+$data = b"This is the secret message which must be encrypted";
+$mode = MCRYPT_ENCRYPT;
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456');
+// tripledes is a block cipher of 64 bits (8 bytes)
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789');
+
+
+$iv = b'12345678';
+echo "\n--- testing different key lengths\n";
+foreach ($keys as $key) {
+   echo "\nkey length=".strlen($key)."\n";
+   var_dump(bin2hex(mcrypt_cbc($cipher, $key, $data, $mode, $iv)));
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+foreach ($ivs as $iv) {
+   echo "\niv length=".strlen($iv)."\n";
+   var_dump(bin2hex(mcrypt_cbc($cipher, $key, $data, $mode, $iv)));
+}
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_encrypt.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_encrypt.php.expectf
new file mode 100644
index 000000000..8cea1b773
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_encrypt.php.expectf
@@ -0,0 +1,30 @@
+*** Testing mcrypt_cbc() : basic functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(112) "082b437d039d09418e20dc9de1dafa7ed6da5c6335b78950968441da1faf40c1f886e04da8ca177b80b376811e138c1bf51cb48dae2e7939"
+
+key length=20
+string(112) "0627351e0f8a082bf7981ae2c700a43fd3d44b270ac67b00fded1c5796eea935be0fef2a23da0b3f5e243929e62ac957bf0bf463aa90fc4f"
+
+key length=24
+string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
+
+key length=26
+HipHop Warning: %a
+string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
+
+--- testing different iv lengths
+
+iv length=4
+HipHop Warning: %a
+string(112) "440a6f54601969b127aad3c217ce7583c7f7b29989693130645569301db0020b29a34a3dcd104b2d0e3ba19d6cbd8a33d352b9c27cc34ef1"
+
+iv length=8
+string(112) "bac347506bf092c5557c4363c301745d78f047028e2953e84fd66b30aeb6005812dadbe8baa871b83278341599b0c448ddaaa52b5a378ce5"
+
+iv length=9
+HipHop Warning: %a
+string(112) "440a6f54601969b127aad3c217ce7583c7f7b29989693130645569301db0020b29a34a3dcd104b2d0e3ba19d6cbd8a33d352b9c27cc34ef1"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php
new file mode 100644
index 000000000..5478f4494
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php
@@ -0,0 +1,29 @@
+<?php
+/* Prototype  : string mcrypt_cbc(int cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : error conditions ***\n";
+
+
+//Test mcrypt_cbc with one more than the expected number of arguments
+echo "\n-- Testing mcrypt_cbc() function with more than expected no. of arguments --\n";
+$cipher = 10;
+$key = 'string_val';
+$data = 'string_val';
+$mode = 10;
+$iv = 'string_val';
+$extra_arg = 10;
+var_dump( mcrypt_cbc($cipher, $key, $data, $mode, $iv, $extra_arg) );
+
+// Testing mcrypt_cbc with one less than the expected number of arguments
+echo "\n-- Testing mcrypt_cbc() function with less than expected no. of arguments --\n";
+$cipher = 10;
+$key = 'string_val';
+$data = 'string_val';
+var_dump( mcrypt_cbc($cipher, $key, $data) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php.expectf
new file mode 100644
index 000000000..40ef3a7ee
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mcrypt_cbc() : error conditions ***
+
+-- Testing mcrypt_cbc() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mcrypt_cbc() function with less than expected no. of arguments --
+HipHop Warning: %a
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_variation4.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_variation4.php
new file mode 100644
index 000000000..fc17ef520
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_variation4.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_cbc(string cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_cbc() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for mode
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_cbc($cipher, $key, $data, $value, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_variation4.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_variation4.php.expectf
new file mode 100644
index 000000000..e6922d7f7
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_variation4.php.expectf
@@ -0,0 +1,82 @@
+*** Testing mcrypt_cbc() : usage variation ***
+
+--float 10.5--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--float -10.5--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--float 12.3456789000e10--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--float -12.3456789000e10--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--float .5--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--empty array--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--int indexed array--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--associative array--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--nested arrays--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--uppercase NULL--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--lowercase null--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--lowercase true--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--lowercase false--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--uppercase TRUE--
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--uppercase FALSE--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--empty string DQ--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--empty string SQ--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--string DQ--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--string SQ--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--mixed case string--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--heredoc--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--instance of classWithToString--
+Error: 8 - Object of class classWithToString could not be converted to int, %s(%d)
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--instance of classWithoutToString--
+Error: 8 - Object of class classWithoutToString could not be converted to int, %s(%d)
+string(32) "983d5edc5f77fe42e2372a0339dc22b0"
+
+--undefined var--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--unset var--
+string(32) "5f781523f696d596e4b809d72197a0cc"
+
+--resource--
+string(%d) %s
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php
new file mode 100644
index 000000000..ff657adc5
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php
@@ -0,0 +1,13 @@
+<?php
+$key      = "FooBar";
+$secret   = "PHP Testfest 2008";
+$cipher   = MCRYPT_RIJNDAEL_128;
+
+$iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_CFB), MCRYPT_RAND);
+$enc_data = mcrypt_cfb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv);
+
+// we have to trim as AES rounds the blocks and decrypt doesnt detect that
+echo trim(mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . "\n";
+
+// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
+mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT);
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php.expectf
new file mode 100644
index 000000000..e96019298
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php.expectf
@@ -0,0 +1,2 @@
+PHP Testfest 2008
+HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_create_iv.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_create_iv.php
new file mode 100644
index 000000000..eb61c85b7
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_create_iv.php
@@ -0,0 +1,8 @@
+<?php
+$iv1 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB), MCRYPT_RAND);
+$iv2 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB), MCRYPT_DEV_URANDOM);
+$iv3 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB), MCRYPT_DEV_RANDOM);
+
+echo strlen($iv1) . "\n";
+echo strlen($iv2) . "\n";
+echo strlen($iv3) . "\n";
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_create_iv.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_create_iv.php.expectf
new file mode 100644
index 000000000..d2863b428
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_create_iv.php.expectf
@@ -0,0 +1,3 @@
+16
+16
+16
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php
new file mode 100644
index 000000000..513e03499
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php
@@ -0,0 +1,16 @@
+<?php
+$key      = "FooBar";
+$secret   = "PHP Testfest 2008";
+$mode     = MCRYPT_MODE_CBC;
+$cipher   = MCRYPT_RIJNDAEL_128;
+
+$iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, $mode), MCRYPT_RAND);
+$enc_data = mcrypt_encrypt($cipher, $key, $secret, $mode, $iv);
+
+// we have to trim as AES rounds the blocks and decrypt doesnt detect that
+echo trim(mcrypt_decrypt($cipher, $key, $enc_data, $mode, $iv)) . "\n";
+
+// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
+mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_CBC);
+
+var_dump(strpos(mcrypt_decrypt(MCRYPT_BLOWFISH, "FooBar", $enc_data, MCRYPT_MODE_CBC, $iv), "Testfest") !== false);
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php.expectf
new file mode 100644
index 000000000..0935d1a21
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php.expectf
@@ -0,0 +1,4 @@
+PHP Testfest 2008
+HipHop Warning: %a
+HipHop Warning: %a
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php
new file mode 100644
index 000000000..525daeb1b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php
@@ -0,0 +1,58 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : basic functionality ***\n";
+
+
+// Initialise all required variables
+$cipher = MCRYPT_3DES;
+$mode = MCRYPT_MODE_CBC;
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456'
+);
+$data1 = array(
+   'IleMhoxiOthmHua4tFBHOw==',
+   'EeF1s6C+w1IiHj1gdDn81g==',
+   'EEuXpjZPueyYoG0LGQ199Q==',
+   'EEuXpjZPueyYoG0LGQ199Q=='
+);
+// tripledes is a block cipher of 64 bits (8 bytes)
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789'
+);
+$data2 = array(
+   '+G7nGcWIxij3TZjpI9lJdQ==',
+   '3bJiFMeyScxOLQcE6mZtLg==',
+   '+G7nGcWIxij3TZjpI9lJdQ=='
+);
+
+$iv = b'12345678';
+echo "\n--- testing different key lengths\n";
+for ($i = 0; $i < sizeof($keys); $i++) {
+   echo "\nkey length=".strlen($keys[$i])."\n";
+   special_var_dump(mcrypt_decrypt($cipher, $keys[$i], base64_decode($data1[$i]), $mode, $iv));
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+for ($i = 0; $i < sizeof($ivs); $i++) {
+   echo "\niv length=".strlen($ivs[$i])."\n";
+   special_var_dump(mcrypt_decrypt($cipher, $key, base64_decode($data2[$i]), $mode, $ivs[$i]));
+}
+
+function special_var_dump($str) {
+   var_dump(bin2hex($str));
+}  
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php.expectf
new file mode 100644
index 000000000..43c4c6944
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php.expectf
@@ -0,0 +1,30 @@
+*** Testing mcrypt_decrypt() : basic functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(32) "736563726574206d6573736167650000"
+
+key length=20
+string(32) "736563726574206d6573736167650000"
+
+key length=24
+string(32) "736563726574206d6573736167650000"
+
+key length=26
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+
+--- testing different iv lengths
+
+iv length=4
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+
+iv length=8
+string(32) "736563726574206d6573736167650000"
+
+iv length=9
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php
new file mode 100644
index 000000000..237dbeb4e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php
@@ -0,0 +1,57 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : basic functionality ***\n";
+
+
+// Initialise all required variables
+$cipher = MCRYPT_3DES;
+$mode = MCRYPT_MODE_ECB;
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456'
+);
+$data1 = array(
+   '0D4ArM3ejyhic9rnCcIW9A==',
+   'q0wt1YeOjLpnKm5WsrzKEw==',
+   'zwKEFeqHkhlj+7HZTRA/yA==',
+   'zwKEFeqHkhlj+7HZTRA/yA=='
+);
+// tripledes is a block cipher of 64 bits (8 bytes)
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789'
+);
+$data2 = array(
+   '+G7nGcWIxigQcJD+2P14HA==',
+   '+G7nGcWIxigQcJD+2P14HA==',
+   '+G7nGcWIxigQcJD+2P14HA=='
+);
+
+echo "\n--- testing different key lengths\n";
+for ($i = 0; $i < sizeof($keys); $i++) {
+   echo "\nkey length=".strlen($keys[$i])."\n";
+   special_var_dump(mcrypt_decrypt($cipher, $keys[$i], base64_decode($data1[$i]), $mode));
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+for ($i = 0; $i < sizeof($ivs); $i++) {
+   echo "\niv length=".strlen($ivs[$i])."\n";
+   special_var_dump(mcrypt_decrypt($cipher, $key, base64_decode($data2[$i]), $mode, $ivs[$i]));
+}
+
+function special_var_dump($str) {
+   var_dump(bin2hex($str));
+}  
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php.expectf
new file mode 100644
index 000000000..d52d8584d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php.expectf
@@ -0,0 +1,28 @@
+*** Testing mcrypt_decrypt() : basic functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(32) "736563726574206d6573736167650000"
+
+key length=20
+string(32) "736563726574206d6573736167650000"
+
+key length=24
+string(32) "736563726574206d6573736167650000"
+
+key length=26
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+
+--- testing different iv lengths
+
+iv length=4
+string(32) "736563726574206d6573736167650000"
+
+iv length=8
+string(32) "736563726574206d6573736167650000"
+
+iv length=9
+string(32) "736563726574206d6573736167650000"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php
new file mode 100644
index 000000000..2a4accdc0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php
@@ -0,0 +1,29 @@
+<?php
+/* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_decrypt() : error conditions ***\n";
+
+
+//Test mcrypt_decrypt with one more than the expected number of arguments
+echo "\n-- Testing mcrypt_decrypt() function with more than expected no. of arguments --\n";
+$cipher = 'string_val';
+$key = 'string_val';
+$data = 'string_val';
+$mode = 'string_val';
+$iv = 'string_val';
+$extra_arg = 10;
+var_dump( mcrypt_decrypt($cipher, $key, $data, $mode, $iv, $extra_arg) );
+
+// Testing mcrypt_decrypt with one less than the expected number of arguments
+echo "\n-- Testing mcrypt_decrypt() function with less than expected no. of arguments --\n";
+$cipher = 'string_val';
+$key = 'string_val';
+$data = 'string_val';
+var_dump( mcrypt_decrypt($cipher, $key, $data) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php.expectf
new file mode 100644
index 000000000..1c20688fe
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mcrypt_decrypt() : error conditions ***
+
+-- Testing mcrypt_decrypt() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mcrypt_decrypt() function with less than expected no. of arguments --
+HipHop Warning: %a
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php
new file mode 100644
index 000000000..ac20fc1ac
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php
@@ -0,0 +1,13 @@
+<?php
+$key      = "FooBar";
+$secret   = "PHP Testfest 2008";
+$cipher   = MCRYPT_RIJNDAEL_128;
+
+$iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);
+$enc_data = mcrypt_ecb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv);
+
+// we have to trim as AES rounds the blocks and decrypt doesnt detect that
+echo trim(mcrypt_ecb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . "\n";
+
+// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
+mcrypt_ecb($cipher, $key, $enc_data, MCRYPT_DECRYPT);
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php.expectf
new file mode 100644
index 000000000..45b75f5b1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php.expectf
@@ -0,0 +1 @@
+PHP Testfest 2008
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php
new file mode 100644
index 000000000..28a7f76c8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php
@@ -0,0 +1,58 @@
+<?php
+/* Prototype  : string mcrypt_ecb(int cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : basic functionality ***\n";
+
+
+$cipher = MCRYPT_TRIPLEDES;
+$data = b"This is the secret message which must be encrypted";
+$mode = MCRYPT_DECRYPT;
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456'
+);
+$data1 = array(
+   '0D4ArM3ejyhic9rnCcIW9A==',
+   'q0wt1YeOjLpnKm5WsrzKEw==',
+   'zwKEFeqHkhlj+7HZTRA/yA==',
+   'zwKEFeqHkhlj+7HZTRA/yA=='
+);
+// tripledes is a block cipher of 64 bits (8 bytes)
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789'
+);
+$data2 = array(
+   '+G7nGcWIxigQcJD+2P14HA==',
+   '+G7nGcWIxigQcJD+2P14HA==',
+   '+G7nGcWIxigQcJD+2P14HA=='
+);
+
+$iv = b'12345678';
+echo "\n--- testing different key lengths\n";
+for ($i = 0; $i < sizeof($keys); $i++) {
+   echo "\nkey length=".strlen($keys[$i])."\n";
+   special_var_dump(mcrypt_ecb($cipher, $keys[$i], base64_decode($data1[$i]), $mode, $iv));
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+for ($i = 0; $i < sizeof($ivs); $i++) {
+   echo "\niv length=".strlen($ivs[$i])."\n";
+   special_var_dump(mcrypt_ecb($cipher, $key, base64_decode($data2[$i]), $mode, $ivs[$i]));
+}
+
+function special_var_dump($str) {
+   var_dump(bin2hex($str));
+}  
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php.expectf
new file mode 100644
index 000000000..85e73905b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php.expectf
@@ -0,0 +1,28 @@
+*** Testing mcrypt_ecb() : basic functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(32) "736563726574206d6573736167650000"
+
+key length=20
+string(32) "736563726574206d6573736167650000"
+
+key length=24
+string(32) "736563726574206d6573736167650000"
+
+key length=26
+HipHop Warning: %a
+string(32) "736563726574206d6573736167650000"
+
+--- testing different iv lengths
+
+iv length=4
+string(32) "736563726574206d6573736167650000"
+
+iv length=8
+string(32) "736563726574206d6573736167650000"
+
+iv length=9
+string(32) "736563726574206d6573736167650000"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_encrypt.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_encrypt.php
new file mode 100644
index 000000000..4e77526a6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_encrypt.php
@@ -0,0 +1,43 @@
+<?php
+/* Prototype  : string mcrypt_ecb(int cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : basic functionality ***\n";
+
+
+$cipher = MCRYPT_TRIPLEDES;
+$data = b"This is the secret message which must be encrypted";
+$mode = MCRYPT_ENCRYPT;
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456'
+);
+// tripledes is a block cipher of 64 bits (8 bytes)
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789'
+);
+
+$iv = b'12345678';
+echo "\n--- testing different key lengths\n";
+foreach ($keys as $key) {
+   echo "\nkey length=".strlen($key)."\n";
+   var_dump(bin2hex(mcrypt_ecb($cipher, $key, $data, $mode, $iv)));
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+foreach ($ivs as $iv) {
+   echo "\niv length=".strlen($iv)."\n";
+   var_dump(bin2hex(mcrypt_ecb($cipher, $key, $data, $mode, $iv)));
+}
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_encrypt.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_encrypt.php.expectf
new file mode 100644
index 000000000..5addc3360
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_encrypt.php.expectf
@@ -0,0 +1,28 @@
+*** Testing mcrypt_ecb() : basic functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(112) "05c9c4cafb9937d950bdae60ee3abcb8d9f3e1f1fac8acaaa5b11d70b7ca02f3b76d447ab3dd85a4b5df5dedb4b4654595ccdf6da97fa93f"
+
+key length=20
+string(112) "0fc7045c4fb4dbcf44baf9ed15ab40331a42ff0632318a16b12ed5873f02e7945e4f63f408d6849534cbb7419c22c8854aaa85e0e05a28e6"
+
+key length=24
+string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
+
+key length=26
+HipHop Warning: %a
+string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
+
+--- testing different iv lengths
+
+iv length=4
+string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165"
+
+iv length=8
+string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165"
+
+iv length=9
+string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_error.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_error.php
new file mode 100644
index 000000000..b4a46d2d5
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_error.php
@@ -0,0 +1,29 @@
+<?php
+/* Prototype  : string mcrypt_ecb(int cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : error conditions ***\n";
+
+
+//Test mcrypt_ecb with one more than the expected number of arguments
+echo "\n-- Testing mcrypt_ecb() function with more than expected no. of arguments --\n";
+$cipher = 10;
+$key = 'string_val';
+$data = 'string_val';
+$mode = 10;
+$iv = 'string_val';
+$extra_arg = 10;
+var_dump( mcrypt_ecb($cipher, $key, $data, $mode, $iv, $extra_arg) );
+
+// Testing mcrypt_ecb with one less than the expected number of arguments
+echo "\n-- Testing mcrypt_ecb() function with less than expected no. of arguments --\n";
+$cipher = 10;
+$key = 'string_val';
+$data = 'string_val';
+var_dump( mcrypt_ecb($cipher, $key, $data) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_error.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_error.php.expectf
new file mode 100644
index 000000000..127fc5805
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mcrypt_ecb() : error conditions ***
+
+-- Testing mcrypt_ecb() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mcrypt_ecb() function with less than expected no. of arguments --
+HipHop Warning: %a
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_variation4.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_variation4.php
new file mode 100644
index 000000000..746e1085a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_variation4.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : string mcrypt_ecb(string cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_ecb() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$cipher = MCRYPT_TRIPLEDES;
+$key = b'string_val';
+$data = b'string_val';
+$iv = b'01234567';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for mode
+
+foreach($inputs as $valueType =>$value) {
+      echo "\n--$valueType--\n";
+      var_dump(bin2hex(mcrypt_ecb($cipher, $key, $data, $value, $iv)));
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_variation4.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_variation4.php.expectf
new file mode 100644
index 000000000..cf13d8364
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_variation4.php.expectf
@@ -0,0 +1,82 @@
+*** Testing mcrypt_ecb() : usage variation ***
+
+--float 10.5--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--float -10.5--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--float 12.3456789000e10--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--float -12.3456789000e10--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--float .5--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--empty array--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--int indexed array--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--associative array--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--nested arrays--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--uppercase NULL--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--lowercase null--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--lowercase true--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--lowercase false--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--uppercase TRUE--
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--uppercase FALSE--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--empty string DQ--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--empty string SQ--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--string DQ--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--string SQ--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--mixed case string--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--heredoc--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--instance of classWithToString--
+Error: 8 - Object of class classWithToString could not be converted to int, %s(%d)
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--instance of classWithoutToString--
+Error: 8 - Object of class classWithoutToString could not be converted to int, %s(%d)
+string(32) "a80c6cef6b42c8759143586a57bb7dc6"
+
+--undefined var--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--unset var--
+string(32) "6438db90653c4d300909aa02fd6163c2"
+
+--resource--
+string(%d) %s
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_algorithms_name.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_algorithms_name.php
new file mode 100644
index 000000000..9d428692b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_algorithms_name.php
@@ -0,0 +1,11 @@
+<?php
+$td  = mcrypt_module_open('rijndael-128', '', MCRYPT_MODE_ECB, '');
+echo mcrypt_enc_get_algorithms_name($td) . "\n";
+$td  = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
+echo mcrypt_enc_get_algorithms_name($td) . "\n";
+$td  = mcrypt_module_open(MCRYPT_RC2, '', MCRYPT_MODE_CBC, '');
+echo mcrypt_enc_get_algorithms_name($td) . "\n";
+$td  = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, '');
+echo mcrypt_enc_get_algorithms_name($td) . "\n";
+$td  = mcrypt_module_open('des', '', 'ecb', '');
+echo mcrypt_enc_get_algorithms_name($td) . "\n";
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_algorithms_name.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_algorithms_name.php.expectf
new file mode 100644
index 000000000..630f2a7a3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_algorithms_name.php.expectf
@@ -0,0 +1,5 @@
+Rijndael-128
+Rijndael-128
+RC2
+Blowfish
+DES
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_block_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_block_size.php
new file mode 100644
index 000000000..05180318f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_block_size.php
@@ -0,0 +1,7 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_get_block_size($td));
+$td = mcrypt_module_open(MCRYPT_3DES, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_get_block_size($td));
+$td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
+var_dump(mcrypt_enc_get_block_size($td));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_block_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_block_size.php.expectf
new file mode 100644
index 000000000..f1cfc112c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_block_size.php.expectf
@@ -0,0 +1,3 @@
+int(32)
+int(8)
+int(1)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_iv_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_iv_size.php
new file mode 100644
index 000000000..e5c9e5b20
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_iv_size.php
@@ -0,0 +1,7 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_get_iv_size($td));
+$td = mcrypt_module_open(MCRYPT_3DES, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_get_iv_size($td));
+$td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
+var_dump(mcrypt_enc_get_iv_size($td));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_iv_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_iv_size.php.expectf
new file mode 100644
index 000000000..f51d511a1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_iv_size.php.expectf
@@ -0,0 +1,3 @@
+int(32)
+int(8)
+int(0)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_key_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_key_size.php
new file mode 100644
index 000000000..259b37e12
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_key_size.php
@@ -0,0 +1,7 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_get_key_size($td));
+$td = mcrypt_module_open(MCRYPT_3DES, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_get_key_size($td));
+$td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
+var_dump(mcrypt_enc_get_key_size($td));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_key_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_key_size.php.expectf
new file mode 100644
index 000000000..e050a394f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_key_size.php.expectf
@@ -0,0 +1,3 @@
+int(32)
+int(24)
+int(32)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_mode_name.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_mode_name.php
new file mode 100644
index 000000000..752f2db5f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_mode_name.php
@@ -0,0 +1,13 @@
+<?php
+$td  = mcrypt_module_open('rijndael-128', '', MCRYPT_MODE_ECB, '');
+echo mcrypt_enc_get_modes_name($td) . "\n";
+$td  = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
+echo mcrypt_enc_get_modes_name($td) . "\n";
+$td  = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
+echo mcrypt_enc_get_modes_name($td) . "\n";
+$td  = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_OFB, '');
+echo mcrypt_enc_get_modes_name($td) . "\n";
+$td  = mcrypt_module_open('des', '', 'ecb', '');
+echo mcrypt_enc_get_modes_name($td) . "\n";
+$td  = mcrypt_module_open('des', '', 'cbc', '');
+echo mcrypt_enc_get_modes_name($td) . "\n";
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_mode_name.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_mode_name.php.expectf
new file mode 100644
index 000000000..b7434503c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_mode_name.php.expectf
@@ -0,0 +1,6 @@
+ECB
+CBC
+STREAM
+OFB
+ECB
+CBC
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_supported_key_sizes.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_supported_key_sizes.php
new file mode 100644
index 000000000..82228cf52
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_supported_key_sizes.php
@@ -0,0 +1,4 @@
+<?php
+$td  = mcrypt_module_open('rijndael-256', '', 'ecb', '');
+$var = mcrypt_enc_get_supported_key_sizes($td);
+var_dump($var);
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_supported_key_sizes.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_supported_key_sizes.php.expectf
new file mode 100644
index 000000000..01e15999d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_get_supported_key_sizes.php.expectf
@@ -0,0 +1,8 @@
+array(3) {
+  [0]=>
+  int(16)
+  [1]=>
+  int(24)
+  [2]=>
+  int(32)
+}
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm.php
new file mode 100644
index 000000000..d677ffd07
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm.php
@@ -0,0 +1,7 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_is_block_algorithm($td));
+$td = mcrypt_module_open(MCRYPT_3DES, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_is_block_algorithm($td));
+$td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
+var_dump(mcrypt_enc_is_block_algorithm($td));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm.php.expectf
new file mode 100644
index 000000000..c70af4d22
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm.php.expectf
@@ -0,0 +1,3 @@
+bool(true)
+bool(true)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm_mode.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm_mode.php
new file mode 100644
index 000000000..6bea468a1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm_mode.php
@@ -0,0 +1,7 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_ECB, '');
+var_dump(mcrypt_enc_is_block_algorithm_mode($td));
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_is_block_algorithm_mode($td));
+$td = mcrypt_module_open(MCRYPT_WAKE, '',  MCRYPT_MODE_STREAM, '');
+var_dump(mcrypt_enc_is_block_algorithm_mode($td));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm_mode.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm_mode.php.expectf
new file mode 100644
index 000000000..c70af4d22
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_algorithm_mode.php.expectf
@@ -0,0 +1,3 @@
+bool(true)
+bool(true)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_mode.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_mode.php
new file mode 100644
index 000000000..0fceebfc4
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_mode.php
@@ -0,0 +1,9 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_is_block_mode($td));
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_ECB, '');
+var_dump(mcrypt_enc_is_block_mode($td));
+$td = mcrypt_module_open(MCRYPT_ARCFOUR, '', MCRYPT_MODE_STREAM, '');
+var_dump(mcrypt_enc_is_block_mode($td));
+$td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
+var_dump(mcrypt_enc_is_block_mode($td));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_mode.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_mode.php.expectf
new file mode 100644
index 000000000..6b1a0e43b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_is_block_mode.php.expectf
@@ -0,0 +1,4 @@
+bool(true)
+bool(true)
+bool(false)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_self_test.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_self_test.php
new file mode 100644
index 000000000..f8449bab8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_self_test.php
@@ -0,0 +1,3 @@
+<?php
+$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+var_dump(mcrypt_enc_self_test($td));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_self_test.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_self_test.php.expectf
new file mode 100644
index 000000000..28fe0105d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_enc_self_test.php.expectf
@@ -0,0 +1 @@
+int(0)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_cbc.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_cbc.php
new file mode 100644
index 000000000..89cce6a6d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_cbc.php
@@ -0,0 +1,51 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : TripleDES functionality ***\n";
+
+//test CBC, ECB modes
+//test encrypt decrypt
+//test tripledes, aes
+//test different lengths of key, iv
+//test no iv being passed on CBC, ECB 
+//test upto 32 bytes with unlimited strength
+
+$cipher = MCRYPT_TRIPLEDES;
+$mode = MCRYPT_MODE_CBC;
+$data = b'This is the secret message which must be encrypted';
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456'
+);
+// tripledes is a block cipher of 64 bits (8 bytes)
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789'
+);
+
+
+$iv = b'12345678';
+echo "\n--- testing different key lengths\n";
+foreach ($keys as $key) {
+   echo "\nkey length=".strlen($key)."\n";
+   var_dump(bin2hex(mcrypt_encrypt($cipher, $key, $data, $mode, $iv)));
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+foreach ($ivs as $iv) {
+   echo "\niv length=".strlen($iv)."\n";
+   var_dump(bin2hex(mcrypt_encrypt($cipher, $key, $data, $mode, $iv)));
+}
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_cbc.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_cbc.php.expectf
new file mode 100644
index 000000000..1931b7439
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_cbc.php.expectf
@@ -0,0 +1,30 @@
+*** Testing mcrypt_encrypt() : TripleDES functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(112) "082b437d039d09418e20dc9de1dafa7ed6da5c6335b78950968441da1faf40c1f886e04da8ca177b80b376811e138c1bf51cb48dae2e7939"
+
+key length=20
+string(112) "0627351e0f8a082bf7981ae2c700a43fd3d44b270ac67b00fded1c5796eea935be0fef2a23da0b3f5e243929e62ac957bf0bf463aa90fc4f"
+
+key length=24
+string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
+
+key length=26
+HipHop Warning: %a
+string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
+
+--- testing different iv lengths
+
+iv length=4
+HipHop Warning: %a
+string(112) "440a6f54601969b127aad3c217ce7583c7f7b29989693130645569301db0020b29a34a3dcd104b2d0e3ba19d6cbd8a33d352b9c27cc34ef1"
+
+iv length=8
+string(112) "bac347506bf092c5557c4363c301745d78f047028e2953e84fd66b30aeb6005812dadbe8baa871b83278341599b0c448ddaaa52b5a378ce5"
+
+iv length=9
+HipHop Warning: %a
+string(112) "440a6f54601969b127aad3c217ce7583c7f7b29989693130645569301db0020b29a34a3dcd104b2d0e3ba19d6cbd8a33d352b9c27cc34ef1"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_ecb.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_ecb.php
new file mode 100644
index 000000000..6a0a3d03e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_ecb.php
@@ -0,0 +1,43 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : TripleDES functionality ***\n";
+
+$cipher = MCRYPT_TRIPLEDES;
+$mode = MCRYPT_MODE_ECB;
+$data = b'This is the secret message which must be encrypted';
+
+// tripledes uses keys upto 192 bits (24 bytes)
+$keys = array(
+   b'12345678', 
+   b'12345678901234567890', 
+   b'123456789012345678901234', 
+   b'12345678901234567890123456'
+);
+
+echo "\n--- testing different key lengths\n";
+foreach ($keys as $key) {
+   echo "\nkey length=".strlen($key)."\n";
+   var_dump(bin2hex(mcrypt_encrypt($cipher, $key, $data, $mode)));
+}
+
+$key = b'12345678';  
+$ivs = array(
+   b'1234', 
+   b'12345678', 
+   b'123456789'
+);
+
+// ivs should be ignored in ecb mode
+echo "\n--- testing different iv lengths\n";
+foreach ($ivs as $iv) {
+   echo "\niv length=".strlen($iv)."\n";
+   var_dump(bin2hex(mcrypt_encrypt($cipher, $key, $data, $mode, $iv)));
+}
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_ecb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_ecb.php.expectf
new file mode 100644
index 000000000..943fbe98a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_3des_ecb.php.expectf
@@ -0,0 +1,28 @@
+*** Testing mcrypt_encrypt() : TripleDES functionality ***
+
+--- testing different key lengths
+
+key length=8
+string(112) "05c9c4cafb9937d950bdae60ee3abcb8d9f3e1f1fac8acaaa5b11d70b7ca02f3b76d447ab3dd85a4b5df5dedb4b4654595ccdf6da97fa93f"
+
+key length=20
+string(112) "0fc7045c4fb4dbcf44baf9ed15ab40331a42ff0632318a16b12ed5873f02e7945e4f63f408d6849534cbb7419c22c8854aaa85e0e05a28e6"
+
+key length=24
+string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
+
+key length=26
+HipHop Warning: %a
+string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
+
+--- testing different iv lengths
+
+iv length=4
+string(112) "05c9c4cafb9937d950bdae60ee3abcb8d9f3e1f1fac8acaaa5b11d70b7ca02f3b76d447ab3dd85a4b5df5dedb4b4654595ccdf6da97fa93f"
+
+iv length=8
+string(112) "05c9c4cafb9937d950bdae60ee3abcb8d9f3e1f1fac8acaaa5b11d70b7ca02f3b76d447ab3dd85a4b5df5dedb4b4654595ccdf6da97fa93f"
+
+iv length=9
+string(112) "05c9c4cafb9937d950bdae60ee3abcb8d9f3e1f1fac8acaaa5b11d70b7ca02f3b76d447ab3dd85a4b5df5dedb4b4654595ccdf6da97fa93f"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_error.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_error.php
new file mode 100644
index 000000000..0662eb18f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_error.php
@@ -0,0 +1,29 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt_encrypt() : error conditions ***\n";
+
+
+//Test mcrypt_encrypt with one more than the expected number of arguments
+echo "\n-- Testing mcrypt_encrypt() function with more than expected no. of arguments --\n";
+$cipher = 'string_val';
+$key = 'string_val';
+$data = 'string_val';
+$mode = 'string_val';
+$iv = 'string_val';
+$extra_arg = 10;
+var_dump( mcrypt_encrypt($cipher, $key, $data, $mode, $iv, $extra_arg) );
+
+// Testing mcrypt_encrypt with one less than the expected number of arguments
+echo "\n-- Testing mcrypt_encrypt() function with less than expected no. of arguments --\n";
+$cipher = 'string_val';
+$key = 'string_val';
+$data = 'string_val';
+var_dump( mcrypt_encrypt($cipher, $key, $data) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_error.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_error.php.expectf
new file mode 100644
index 000000000..5c4f4ed90
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_encrypt_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mcrypt_encrypt() : error conditions ***
+
+-- Testing mcrypt_encrypt() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mcrypt_encrypt() function with less than expected no. of arguments --
+HipHop Warning: %a
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_block_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_block_size.php
new file mode 100644
index 000000000..c28f02293
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_block_size.php
@@ -0,0 +1,4 @@
+<?php
+var_dump(mcrypt_get_block_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC));
+var_dump(mcrypt_get_block_size(MCRYPT_3DES, MCRYPT_MODE_CBC));
+var_dump(mcrypt_get_block_size(MCRYPT_WAKE, MCRYPT_MODE_STREAM));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_block_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_block_size.php.expectf
new file mode 100644
index 000000000..f1cfc112c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_block_size.php.expectf
@@ -0,0 +1,3 @@
+int(32)
+int(8)
+int(1)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_cipher_name.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_cipher_name.php
new file mode 100644
index 000000000..a7060f4c8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_cipher_name.php
@@ -0,0 +1,5 @@
+<?php
+echo mcrypt_get_cipher_name(MCRYPT_RIJNDAEL_256) . "\n";
+echo mcrypt_get_cipher_name(MCRYPT_RC2) . "\n";
+echo mcrypt_get_cipher_name(MCRYPT_ARCFOUR) . "\n";
+echo mcrypt_get_cipher_name(MCRYPT_WAKE) . "\n";
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_cipher_name.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_cipher_name.php.expectf
new file mode 100644
index 000000000..8c9ae27f5
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_cipher_name.php.expectf
@@ -0,0 +1,4 @@
+Rijndael-256
+RC2
+RC4
+WAKE
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_iv_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_iv_size.php
new file mode 100644
index 000000000..339328303
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_iv_size.php
@@ -0,0 +1,5 @@
+<?php
+var_dump(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC));
+var_dump(mcrypt_get_iv_size(MCRYPT_3DES, MCRYPT_MODE_CBC));
+var_dump(mcrypt_get_iv_size(MCRYPT_WAKE, MCRYPT_MODE_STREAM));
+var_dump(mcrypt_get_iv_size(MCRYPT_XTEA, MCRYPT_MODE_STREAM));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_iv_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_iv_size.php.expectf
new file mode 100644
index 000000000..510596c4d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_iv_size.php.expectf
@@ -0,0 +1,5 @@
+int(32)
+int(8)
+int(0)
+HipHop Warning: %a
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_key_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_key_size.php
new file mode 100644
index 000000000..93ed1fbe0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_key_size.php
@@ -0,0 +1,4 @@
+<?php
+var_dump(mcrypt_get_key_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC));
+var_dump(mcrypt_get_key_size(MCRYPT_3DES, MCRYPT_MODE_CBC));
+var_dump(mcrypt_get_key_size(MCRYPT_WAKE, MCRYPT_MODE_STREAM));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_get_key_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_key_size.php.expectf
new file mode 100644
index 000000000..e050a394f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_get_key_size.php.expectf
@@ -0,0 +1,3 @@
+int(32)
+int(24)
+int(32)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_list_algorithms.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_algorithms.php
new file mode 100644
index 000000000..de46d5fac
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_algorithms.php
@@ -0,0 +1,6 @@
+<?php
+foreach (mcrypt_list_algorithms() as $algo) {
+	if (in_array($algo, array('rijndael-256', 'des', 'blowfish', 'twofish'))) {
+	   echo "FOUND\n";
+	}
+}
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_list_algorithms.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_algorithms.php.expectf
new file mode 100644
index 000000000..b72a62463
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_algorithms.php.expectf
@@ -0,0 +1,4 @@
+FOUND
+FOUND
+FOUND
+FOUND
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_list_modes.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_modes.php
new file mode 100644
index 000000000..1176957ec
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_modes.php
@@ -0,0 +1,2 @@
+<?php
+var_dump(mcrypt_list_modes());
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_list_modes.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_modes.php.expectf
new file mode 100644
index 000000000..7b6a86724
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_list_modes.php.expectf
@@ -0,0 +1,18 @@
+array(8) {
+  [0]=>
+  string(3) "cbc"
+  [1]=>
+  string(3) "cfb"
+  [2]=>
+  string(3) "ctr"
+  [3]=>
+  string(3) "ecb"
+  [4]=>
+  string(4) "ncfb"
+  [5]=>
+  string(4) "nofb"
+  [6]=>
+  string(3) "ofb"
+  [7]=>
+  string(6) "stream"
+}
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_block_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_block_size.php
new file mode 100644
index 000000000..5e589a745
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_block_size.php
@@ -0,0 +1,7 @@
+<?php
+var_dump(mcrypt_module_get_algo_block_size(MCRYPT_RIJNDAEL_256));
+var_dump(mcrypt_module_get_algo_block_size(MCRYPT_RIJNDAEL_192));
+var_dump(mcrypt_module_get_algo_block_size(MCRYPT_RC2));
+var_dump(mcrypt_module_get_algo_block_size(MCRYPT_XTEA));
+var_dump(mcrypt_module_get_algo_block_size(MCRYPT_CAST_128));
+var_dump(mcrypt_module_get_algo_block_size(MCRYPT_BLOWFISH));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_block_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_block_size.php.expectf
new file mode 100644
index 000000000..9c52177db
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_block_size.php.expectf
@@ -0,0 +1,6 @@
+int(32)
+int(24)
+int(8)
+int(8)
+int(8)
+int(8)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_key_size.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_key_size.php
new file mode 100644
index 000000000..d6365d2dd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_key_size.php
@@ -0,0 +1,7 @@
+<?php
+var_dump(mcrypt_module_get_algo_key_size(MCRYPT_RIJNDAEL_256));
+var_dump(mcrypt_module_get_algo_key_size(MCRYPT_RIJNDAEL_192));
+var_dump(mcrypt_module_get_algo_key_size(MCRYPT_RC2));
+var_dump(mcrypt_module_get_algo_key_size(MCRYPT_XTEA));
+var_dump(mcrypt_module_get_algo_key_size(MCRYPT_CAST_128));
+var_dump(mcrypt_module_get_algo_key_size(MCRYPT_BLOWFISH));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_key_size.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_key_size.php.expectf
new file mode 100644
index 000000000..2daa59f19
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_algo_key_size.php.expectf
@@ -0,0 +1,6 @@
+int(32)
+int(32)
+int(128)
+int(16)
+int(16)
+int(56)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_supported_key_sizes.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_supported_key_sizes.php
new file mode 100644
index 000000000..c5fcc9702
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_supported_key_sizes.php
@@ -0,0 +1,3 @@
+<?php
+var_dump(mcrypt_module_get_supported_key_sizes(MCRYPT_RIJNDAEL_256));
+var_dump(mcrypt_module_get_supported_key_sizes(MCRYPT_RC2));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_supported_key_sizes.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_supported_key_sizes.php.expectf
new file mode 100644
index 000000000..494c7cb6f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_get_supported_key_sizes.php.expectf
@@ -0,0 +1,10 @@
+array(3) {
+  [0]=>
+  int(16)
+  [1]=>
+  int(24)
+  [2]=>
+  int(32)
+}
+array(0) {
+}
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm.php
new file mode 100644
index 000000000..86ecf5d3d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm.php
@@ -0,0 +1,5 @@
+<?php
+var_dump(mcrypt_module_is_block_algorithm(MCRYPT_RIJNDAEL_128));
+var_dump(mcrypt_module_is_block_algorithm(MCRYPT_DES));
+var_dump(mcrypt_module_is_block_algorithm(MCRYPT_WAKE));
+var_dump(mcrypt_module_is_block_algorithm(MCRYPT_XTEA));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm.php.expectf
new file mode 100644
index 000000000..e611f3fe2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm.php.expectf
@@ -0,0 +1,4 @@
+bool(true)
+bool(true)
+bool(false)
+bool(true)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm_mode.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm_mode.php
new file mode 100644
index 000000000..95a9d918f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm_mode.php
@@ -0,0 +1,5 @@
+<?php
+var_dump(mcrypt_module_is_block_algorithm_mode(MCRYPT_MODE_CBC));
+var_dump(mcrypt_module_is_block_algorithm_mode(MCRYPT_MODE_ECB));
+var_dump(mcrypt_module_is_block_algorithm_mode(MCRYPT_MODE_STREAM));
+var_dump(mcrypt_module_is_block_algorithm_mode(MCRYPT_MODE_OFB));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm_mode.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm_mode.php.expectf
new file mode 100644
index 000000000..e611f3fe2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_algorithm_mode.php.expectf
@@ -0,0 +1,4 @@
+bool(true)
+bool(true)
+bool(false)
+bool(true)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_mode.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_mode.php
new file mode 100644
index 000000000..c9bcb8ba6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_mode.php
@@ -0,0 +1,6 @@
+<?php
+var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_CBC));
+var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_ECB));
+var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_STREAM));
+var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_NOFB));
+var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_OFB));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_mode.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_mode.php.expectf
new file mode 100644
index 000000000..5abbfc446
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_is_block_mode.php.expectf
@@ -0,0 +1,5 @@
+bool(true)
+bool(true)
+bool(false)
+bool(false)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_self_test.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_self_test.php
new file mode 100644
index 000000000..efed63fa9
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_self_test.php
@@ -0,0 +1,4 @@
+<?php
+var_dump(mcrypt_module_self_test(MCRYPT_RIJNDAEL_128));
+var_dump(mcrypt_module_self_test(MCRYPT_RC2));
+var_dump(mcrypt_module_self_test(''));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_module_self_test.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_self_test.php.expectf
new file mode 100644
index 000000000..c70af4d22
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_module_self_test.php.expectf
@@ -0,0 +1,3 @@
+bool(true)
+bool(true)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ofb.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_ofb.php
new file mode 100644
index 000000000..19b4ab17c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ofb.php
@@ -0,0 +1,13 @@
+<?php
+$key      = "FooBar";
+$secret   = "PHP Testfest 2008";
+$cipher   = MCRYPT_RIJNDAEL_128;
+
+$iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);
+$enc_data = mcrypt_ofb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv);
+
+// we have to trim as AES rounds the blocks and decrypt doesnt detect that
+echo trim(mcrypt_ofb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . "\n";
+
+// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
+mcrypt_ofb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv);
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ofb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_ofb.php.expectf
new file mode 100644
index 000000000..45b75f5b1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ofb.php.expectf
@@ -0,0 +1 @@
+PHP Testfest 2008
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_128BitKey.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_128BitKey.php
new file mode 100644
index 000000000..6f851a937
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_128BitKey.php
@@ -0,0 +1,62 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+ /* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+ /* Prototype  : string mcrypt_cbc(int cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt : Rijndael128 functionality ***\n";
+
+$cipher = MCRYPT_RIJNDAEL_128;
+$mode = MCRYPT_MODE_CBC;
+$data = b'This is the secret message which must be encrypted';
+
+// keys upto 128 bits (16 bytes)
+$keys = array(
+   null, 
+   '', 
+   b'12345678', 
+   b'1234567890123456'
+);
+// rijndael128 is a block cipher of 128 bits (16 bytes)
+$ivs = array(
+   null, 
+   '', 
+   b'12345678', 
+   b'1234567890123456', 
+   b'12345678901234567'
+);
+
+
+$iv = b'1234567890123456';
+echo "\n--- testing different key lengths\n";
+foreach ($keys as $key) {
+   echo "\nkey length=".strlen($key)."\n";
+   $res = mcrypt_encrypt($cipher, $key, $data, MCRYPT_MODE_CBC, $iv);
+   var_dump(bin2hex($res));
+   $res = mcrypt_cbc($cipher, $key, $res, MCRYPT_DECRYPT, $iv);
+   var_dump(bin2hex($res));   
+}
+
+$key = b'1234567890123456';  
+echo "\n--- testing different iv lengths\n";
+foreach ($ivs as $iv) {
+   echo "\niv length=".strlen($iv)."\n";
+   $res = mcrypt_cbc($cipher, $key, $data, $mode, $iv);
+   var_dump(bin2hex($res));
+   $res = mcrypt_decrypt($cipher, $key, $res, MCRYPT_MODE_CBC, $iv);
+   var_dump(bin2hex($res));   
+}
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_128BitKey.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_128BitKey.php.expectf
new file mode 100644
index 000000000..67d7aaa0a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_128BitKey.php.expectf
@@ -0,0 +1,50 @@
+*** Testing mcrypt : Rijndael128 functionality ***
+
+--- testing different key lengths
+
+key length=0
+string(128) "4fbf24aaa789f5194260ade1acd9499402c1845cc517e8fe43cfb5b90a0df294db33ecd1a836c47d6bf6d8600512ba415e17008a1e1991f81056258d82099397"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+key length=0
+string(128) "4fbf24aaa789f5194260ade1acd9499402c1845cc517e8fe43cfb5b90a0df294db33ecd1a836c47d6bf6d8600512ba415e17008a1e1991f81056258d82099397"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+key length=8
+string(128) "d6a3042b278fa5816dc6f46152acbe5fd7d1813c3808c27cd969d8e10a64d0238724edfda0322f4512308f22d142df0e92bed861c2b732f7650e234df59183dc"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+key length=16
+string(128) "dc8f957ec530acf10cd95ba7da7b6405380fe19a2941e9a8de54680512f18491bc374e5464885ae6c2ae2aa7a6cdd2fbe12a06bbc4bd59dbbfaa15f09044f101"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+--- testing different iv lengths
+
+iv length=0
+HipHop Warning: %a
+string(128) "c082b3fabaae4c8c410eb8dba64bae10e48d79b5241fb8f24462cad43bd0b35ad2746b00817e9dcbc636b44df0ec60b46a57e7a310a308a0947724e3817a13b4"
+HipHop Warning: %a
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+iv length=0
+HipHop Warning: %a
+string(128) "c082b3fabaae4c8c410eb8dba64bae10e48d79b5241fb8f24462cad43bd0b35ad2746b00817e9dcbc636b44df0ec60b46a57e7a310a308a0947724e3817a13b4"
+HipHop Warning: %a
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+iv length=8
+HipHop Warning: %a
+string(128) "c082b3fabaae4c8c410eb8dba64bae10e48d79b5241fb8f24462cad43bd0b35ad2746b00817e9dcbc636b44df0ec60b46a57e7a310a308a0947724e3817a13b4"
+HipHop Warning: %a
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+iv length=16
+string(128) "dc8f957ec530acf10cd95ba7da7b6405380fe19a2941e9a8de54680512f18491bc374e5464885ae6c2ae2aa7a6cdd2fbe12a06bbc4bd59dbbfaa15f09044f101"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+iv length=17
+HipHop Warning: %a
+string(128) "c082b3fabaae4c8c410eb8dba64bae10e48d79b5241fb8f24462cad43bd0b35ad2746b00817e9dcbc636b44df0ec60b46a57e7a310a308a0947724e3817a13b4"
+HipHop Warning: %a
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_256BitKey.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_256BitKey.php
new file mode 100644
index 000000000..22dd0bb3c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_256BitKey.php
@@ -0,0 +1,49 @@
+<?php
+/* Prototype  : string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+ /* Prototype  : string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
+ * Description: OFB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+ /* Prototype  : string mcrypt_cbc(int cipher, string key, string data, int mode, string iv)
+ * Description: CBC crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+ /* Prototype  : string mcrypt_ecb(int cipher, string key, string data, int mode, string iv)
+ * Description: ECB crypt/decrypt data using key key with cipher cipher starting with iv 
+ * Source code: ext/mcrypt/mcrypt.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mcrypt : Rijndael128 functionality ***\n";
+
+$cipher = MCRYPT_RIJNDAEL_128;
+$mode = MCRYPT_MODE_CBC;
+$data = b'This is the secret message which must be encrypted';
+
+// keys : 20 bytes, 24 bytes, 30 Bytes, 32 Bytes, 40 Bytes
+$keys = array(
+              b'12345678901234567890', 
+              b'123456789012345678901234', 
+              b'123456789012345678901234567890',
+              b'12345678901234567890123456789012',
+              b'1234567890123456789012345678901234567890'
+ );
+// rijndael128 is a block cipher of 128 bits (16 bytes)
+$iv = b'1234567890123456';
+
+echo "\n--- testing different key lengths\n";
+foreach ($keys as $key) {
+   echo "\nkey length=".strlen($key)."\n";
+   $res = mcrypt_encrypt($cipher, $key, $data, MCRYPT_MODE_CBC, $iv);
+   var_dump(bin2hex($res));
+   $res = mcrypt_decrypt($cipher, $key, $res, MCRYPT_MODE_CBC, $iv);
+   var_dump(bin2hex($res));   
+}
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_256BitKey.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_256BitKey.php.expectf
new file mode 100644
index 000000000..510d675b1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_rijndael128_256BitKey.php.expectf
@@ -0,0 +1,26 @@
+*** Testing mcrypt : Rijndael128 functionality ***
+
+--- testing different key lengths
+
+key length=20
+string(128) "6369830bfc89a39c9981c9a40e349e3bbc8599c28d7ffbd7a330a67690dac6dfb76a55814e95c83cced68eb1544cdd8406d272c249bd0a60fa5b605d4aefbaa0"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+key length=24
+string(128) "8ecdf1ed5742aff16ef34c819c8d22c707c54f4d9ffc18e5f6ab79fe68c25705351e2c001a0b9f29e5def67570ca9da644efb69a8bb97940cb4bec094dae8bb5"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+key length=30
+string(128) "f7731f0c0ab22270b2f516c7837256ed731ba6658ca8f78cda2ab1588e204f990843719ae88474f6572711674fcda9f40d99155e4cc4f5a31aa461ad36a7871d"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+key length=32
+string(128) "f23bc103bfd0859a8318acee6d96e5f43dff68f3cdeae817a1e77c33492e32bdb82c5f660fcd1a2bfda70d9de4d5d8028ce179a9e2f7f9ee7dd61c7b4b409e95"
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+
+key length=40
+HipHop Warning: %a
+string(128) "f23bc103bfd0859a8318acee6d96e5f43dff68f3cdeae817a1e77c33492e32bdb82c5f660fcd1a2bfda70d9de4d5d8028ce179a9e2f7f9ee7dd61c7b4b409e95"
+HipHop Warning: %a
+string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mcrypt/vectors.txt b/hphp/test/zend/good/ext-mcrypt/vectors.txt
new file mode 100644
index 000000000..3624ed6d6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mcrypt/vectors.txt
@@ -0,0 +1,33 @@
+0000000000000000        0000000000000000        4EF997456198DD78
+FFFFFFFFFFFFFFFF        FFFFFFFFFFFFFFFF        51866FD5B85ECB8A
+3000000000000000        1000000000000001        7D856F9A613063F2
+1111111111111111        1111111111111111        2466DD878B963C9D
+0123456789ABCDEF        1111111111111111        61F9C3802281B096
+1111111111111111        0123456789ABCDEF        7D0CC630AFDA1EC7
+FEDCBA9876543210        0123456789ABCDEF        0ACEAB0FC6A0A28D
+7CA110454A1A6E57        01A1D6D039776742        59C68245EB05282B
+0131D9619DC1376E        5CD54CA83DEF57DA        B1B8CC0B250F09A0
+07A1133E4A0B2686        0248D43806F67172        1730E5778BEA1DA4
+3849674C2602319E        51454B582DDF440A        A25E7856CF2651EB
+04B915BA43FEB5B6        42FD443059577FA2        353882B109CE8F1A
+0113B970FD34F2CE        059B5E0851CF143A        48F4D0884C379918
+0170F175468FB5E6        0756D8E0774761D2        432193B78951FC98
+43297FAD38E373FE        762514B829BF486A        13F04154D69D1AE5
+07A7137045DA2A16        3BDD119049372802        2EEDDA93FFD39C79
+04689104C2FD3B2F        26955F6835AF609A        D887E0393C2DA6E3
+37D06BB516CB7546        164D5E404F275232        5F99D04F5B163969
+1F08260D1AC2465E        6B056E18759F5CCA        4A057A3B24D3977B
+584023641ABA6176        004BD6EF09176062        452031C1E4FADA8E
+025816164629B007        480D39006EE762F2        7555AE39F59B87BD
+49793EBC79B3258F        437540C8698F3CFA        53C55F9CB49FC019
+4FB05E1515AB73A7        072D43A077075292        7A8E7BFA937E89A3
+49E95D6D4CA229BF        02FE55778117F12A        CF9C5D7A4986ADB5
+018310DC409B26D6        1D9D5C5018F728C2        D1ABB290658BC778
+1C587F1C13924FEF        305532286D6F295A        55CB3774D13EF201
+0101010101010101        0123456789ABCDEF        FA34EC4847B268B2
+1F1F1F1F0E0E0E0E        0123456789ABCDEF        A790795108EA3CAE
+E0FEE0FEF1FEF1FE        0123456789ABCDEF        C39E072D9FAC631D
+0000000000000000        FFFFFFFFFFFFFFFF        014933E0CDAFF6E4
+FFFFFFFFFFFFFFFF        0000000000000000        F21E9A77B71C49BC
+0123456789ABCDEF        0000000000000000        245946885754369A
+FEDCBA9876543210        FFFFFFFFFFFFFFFF        6B5C5A9C5D9E0A5A
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 7077ce08b..bec8b9ff5 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -107,7 +107,6 @@ no_import = (
     # not imported yet, but will be
     '/ext/gd',
     '/ext/standard',
-    '/ext/mcrypt',
     '/ext/mysql',
     '/ext/pdo_mysql',
     '/ext/pdo_sqlite',
@@ -209,6 +208,7 @@ other_files = (
     '/ext-intl/ut_common.inc',
     '/ext-ldap/connect.inc',
     '/ext-mbstring/common.inc',
+    '/ext-mcrypt/vectors.txt',
     '/ext-openssl/005_crt.txt',
     '/ext-openssl/bug37820cert.pem',
     '/ext-openssl/bug37820key.pem',