From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 26 Jul 2009 08:13:40 +0000 (+0000)
Subject: Fix a bunch of binary/unicode issues in the mcrypt tests
X-Git-Tag: php-5.4.0alpha1~191^2~2961
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4551e0fda331c96858d1cb18b0cb1860e1b74c25;p=php

Fix a bunch of binary/unicode issues in the mcrypt tests
---

diff --git a/ext/mcrypt/tests/bug41252.phpt b/ext/mcrypt/tests/bug41252.phpt
index b184f800f5..f360d1debf 100644
--- a/ext/mcrypt/tests/bug41252.phpt
+++ b/ext/mcrypt/tests/bug41252.phpt
@@ -5,7 +5,7 @@ Bug #41252 (Calling mcrypt_generic without first calling mcrypt_generic_init cra
 --FILE--
 <?php
 $td = mcrypt_module_open(MCRYPT_DES, '', MCRYPT_MODE_ECB, '');
-echo mcrypt_generic($td,'aaaaaaaa');
+echo mcrypt_generic($td,b'aaaaaaaa');
 print "I'm alive!\n";
 ?>
 --EXPECTF--
diff --git a/ext/mcrypt/tests/mcrypt_cbc.phpt b/ext/mcrypt/tests/mcrypt_cbc.phpt
index 43b50ab211..dd352c1ae5 100644
--- a/ext/mcrypt/tests/mcrypt_cbc.phpt
+++ b/ext/mcrypt/tests/mcrypt_cbc.phpt
@@ -4,8 +4,8 @@ mcrypt_cbc
 <?php if (!extension_loaded("mcrypt") || unicode_semantics()) print "skip"; ?>
 --FILE--
 <?php
-$key      = "FooBar";
-$secret   = "PHP Testfest 2008";
+$key      = b"FooBar";
+$secret   = b"PHP Testfest 2008";
 $cipher   = MCRYPT_RIJNDAEL_128;
 
 $iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);
diff --git a/ext/mcrypt/tests/mcrypt_cbf.phpt b/ext/mcrypt/tests/mcrypt_cbf.phpt
index ebc2834aba..0e1f358c44 100644
--- a/ext/mcrypt/tests/mcrypt_cbf.phpt
+++ b/ext/mcrypt/tests/mcrypt_cbf.phpt
@@ -4,8 +4,8 @@ mcrypt_cbf
 <?php if (!extension_loaded("mcrypt") || unicode_semantics()) print "skip"; ?>
 --FILE--
 <?php
-$key      = "FooBar";
-$secret   = "PHP Testfest 2008";
+$key      = b"FooBar";
+$secret   = b"PHP Testfest 2008";
 $cipher   = MCRYPT_RIJNDAEL_128;
 
 $iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);
diff --git a/ext/mcrypt/tests/mcrypt_decrypt.phpt b/ext/mcrypt/tests/mcrypt_decrypt.phpt
index 498762bc89..9fb9f69ddc 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt.phpt
@@ -4,8 +4,8 @@ mcrypt_decrypt
 <?php if (!extension_loaded("mcrypt") || unicode_semantics()) print "skip"; ?>
 --FILE--
 <?php
-$key      = "FooBar";
-$secret   = "PHP Testfest 2008";
+$key      = b"FooBar";
+$secret   = b"PHP Testfest 2008";
 $mode     = MCRYPT_MODE_CBC;
 $cipher   = MCRYPT_RIJNDAEL_128;
 
@@ -18,7 +18,7 @@ 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);
+var_dump(strpos(mcrypt_decrypt(MCRYPT_BLOWFISH, b"FooBar", $enc_data, MCRYPT_MODE_CBC, $iv), b"Testfest") !== false);
 --EXPECTF--
 PHP Testfest 2008
 
diff --git a/ext/mcrypt/tests/mcrypt_ecb.phpt b/ext/mcrypt/tests/mcrypt_ecb.phpt
index fc54516e42..fcaf1c0637 100644
--- a/ext/mcrypt/tests/mcrypt_ecb.phpt
+++ b/ext/mcrypt/tests/mcrypt_ecb.phpt
@@ -4,8 +4,8 @@ mcrypt_ecb
 <?php if (!extension_loaded("mcrypt") || unicode_semantics()) print "skip"; ?>
 --FILE--
 <?php
-$key      = "FooBar";
-$secret   = "PHP Testfest 2008";
+$key      = b"FooBar";
+$secret   = b"PHP Testfest 2008";
 $cipher   = MCRYPT_RIJNDAEL_128;
 
 $iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);
diff --git a/ext/mcrypt/tests/mcrypt_list_modes.phpt b/ext/mcrypt/tests/mcrypt_list_modes.phpt
index 4b9fa7938f..1996866aab 100644
--- a/ext/mcrypt/tests/mcrypt_list_modes.phpt
+++ b/ext/mcrypt/tests/mcrypt_list_modes.phpt
@@ -8,19 +8,19 @@ var_dump(mcrypt_list_modes());
 --EXPECT--
 array(8) {
   [0]=>
-  string(3) "cbc"
+  unicode(3) "cbc"
   [1]=>
-  string(3) "cfb"
+  unicode(3) "cfb"
   [2]=>
-  string(3) "ctr"
+  unicode(3) "ctr"
   [3]=>
-  string(3) "ecb"
+  unicode(3) "ecb"
   [4]=>
-  string(4) "ncfb"
+  unicode(4) "ncfb"
   [5]=>
-  string(4) "nofb"
+  unicode(4) "nofb"
   [6]=>
-  string(3) "ofb"
+  unicode(3) "ofb"
   [7]=>
-  string(6) "stream"
+  unicode(6) "stream"
 }
diff --git a/ext/mcrypt/tests/mcrypt_ofb.phpt b/ext/mcrypt/tests/mcrypt_ofb.phpt
index 0ed1e191d2..348a5ff868 100644
--- a/ext/mcrypt/tests/mcrypt_ofb.phpt
+++ b/ext/mcrypt/tests/mcrypt_ofb.phpt
@@ -4,8 +4,8 @@ mcrypt_ofb
 <?php if (!extension_loaded("mcrypt") || unicode_semantics()) print "skip"; ?>
 --FILE--
 <?php
-$key      = "FooBar";
-$secret   = "PHP Testfest 2008";
+$key      = b"FooBar";
+$secret   = b"PHP Testfest 2008";
 $cipher   = MCRYPT_RIJNDAEL_128;
 
 $iv       = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND);