summaryrefslogtreecommitdiff
path: root/ext/mcrypt/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mcrypt/tests')
-rw-r--r--ext/mcrypt/tests/mcrypt_cfb.phpt1
-rw-r--r--ext/mcrypt/tests/mcrypt_ecb.phpt1
-rw-r--r--ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_enc_self_test.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_encrypt_error.phpt1
-rw-r--r--ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt1
-rw-r--r--ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt1
-rw-r--r--ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt1
-rw-r--r--ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt1
-rw-r--r--ext/mcrypt/tests/mcrypt_filters.phpt3
-rw-r--r--ext/mcrypt/tests/mcrypt_get_iv_size.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_list_algorithms.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_list_modes.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_module_open.phpt2
-rw-r--r--ext/mcrypt/tests/mcrypt_ofb.phpt1
21 files changed, 12 insertions, 23 deletions
diff --git a/ext/mcrypt/tests/mcrypt_cfb.phpt b/ext/mcrypt/tests/mcrypt_cfb.phpt
index 1ff72ab2e0..4039dbe5e4 100644
--- a/ext/mcrypt/tests/mcrypt_cfb.phpt
+++ b/ext/mcrypt/tests/mcrypt_cfb.phpt
@@ -16,7 +16,6 @@ echo trim(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_CFB, $iv)) . "\n"
// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
var_dump(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_CFB));
-
--EXPECTF--
Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_cfb.php on line 6
diff --git a/ext/mcrypt/tests/mcrypt_ecb.phpt b/ext/mcrypt/tests/mcrypt_ecb.phpt
index 625d55880b..dfadf5cf6d 100644
--- a/ext/mcrypt/tests/mcrypt_ecb.phpt
+++ b/ext/mcrypt/tests/mcrypt_ecb.phpt
@@ -16,7 +16,6 @@ echo trim(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_ECB, $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_ECB);
-
--EXPECTF--
Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_ecb.php on line 6
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt b/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt
index f0ee269a35..804e4bd8e4 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt
@@ -38,4 +38,4 @@ Blowfish
Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 10
Deprecated: Function mcrypt_enc_get_algorithms_name() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 11
-DES \ No newline at end of file
+DES
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt b/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt
index 8cde780d9e..3d285639f3 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt
@@ -18,4 +18,4 @@ array(3) {
int(24)
[2]=>
int(32)
-} \ No newline at end of file
+}
diff --git a/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt b/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt
index e59d11dde4..93b4a01007 100644
--- a/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt
@@ -31,4 +31,4 @@ bool(false)
Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 8
Deprecated: Function mcrypt_enc_is_block_mode() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 9
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_enc_self_test.phpt b/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
index 2297b969c1..fc3c131a5a 100644
--- a/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
@@ -10,4 +10,4 @@ var_dump(mcrypt_enc_self_test($td));
Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_self_test.php on line 2
Deprecated: Function mcrypt_enc_self_test() is deprecated in %s%emcrypt_enc_self_test.php on line 3
-int(0) \ No newline at end of file
+int(0)
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_error.phpt b/ext/mcrypt/tests/mcrypt_encrypt_error.phpt
index bbae095d9f..e308d093f2 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_error.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_error.phpt
@@ -53,4 +53,3 @@ Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_error.
Warning: mcrypt_encrypt() expects at least 4 parameters, 3 given in %s on line %d
NULL
===DONE===
-
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt
index 19aab794b1..d371c621bf 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt
@@ -253,4 +253,3 @@ Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variat
Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, resource given, %s(%d)
NULL
===DONE===
-
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt
index c64f944b44..37652cd6e7 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt
@@ -253,4 +253,3 @@ Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variat
Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, resource given, %s(%d)
string(0) ""
===DONE===
-
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt
index 5bd265d38d..e8acd95de5 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt
@@ -233,4 +233,3 @@ Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variat
Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, resource given, %s(%d)
string(0) ""
===DONE===
-
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt
index 0879a0003b..0bb9febed3 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt
@@ -254,4 +254,3 @@ Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variat
Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, resource given, %s(%d)
string(0) ""
===DONE===
-
diff --git a/ext/mcrypt/tests/mcrypt_filters.phpt b/ext/mcrypt/tests/mcrypt_filters.phpt
index 3cae60bb59..131d03979d 100644
--- a/ext/mcrypt/tests/mcrypt_filters.phpt
+++ b/ext/mcrypt/tests/mcrypt_filters.phpt
@@ -33,7 +33,6 @@ fclose($fp);
echo $data."\n";
@unlink($secretfile);
-
--EXPECTF--
FOUND
FOUND
@@ -42,4 +41,4 @@ Deprecated: stream_filter_append(): mcrypt and mdecrypt stream filters have been
32e14bd3c31f2bd666e4290ebdb166a7
Deprecated: stream_filter_append(): mcrypt and mdecrypt stream filters have been deprecated in %s%emcrypt_filters.php on line 24
-Secret secret secret data \ No newline at end of file
+Secret secret secret data
diff --git a/ext/mcrypt/tests/mcrypt_get_iv_size.phpt b/ext/mcrypt/tests/mcrypt_get_iv_size.phpt
index ac3e4148cd..b852155b21 100644
--- a/ext/mcrypt/tests/mcrypt_get_iv_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_get_iv_size.phpt
@@ -21,4 +21,4 @@ int(0)
Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_get_iv_size.php on line 5
Warning: mcrypt_get_iv_size(): Module initialization failed in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_list_algorithms.phpt b/ext/mcrypt/tests/mcrypt_list_algorithms.phpt
index 6a7bfd7c70..d25c645a25 100644
--- a/ext/mcrypt/tests/mcrypt_list_algorithms.phpt
+++ b/ext/mcrypt/tests/mcrypt_list_algorithms.phpt
@@ -14,4 +14,4 @@ Deprecated: Function mcrypt_list_algorithms() is deprecated in %s%emcrypt_list_a
FOUND
FOUND
FOUND
-FOUND \ No newline at end of file
+FOUND
diff --git a/ext/mcrypt/tests/mcrypt_list_modes.phpt b/ext/mcrypt/tests/mcrypt_list_modes.phpt
index 8cebbcbb0c..4c8d203329 100644
--- a/ext/mcrypt/tests/mcrypt_list_modes.phpt
+++ b/ext/mcrypt/tests/mcrypt_list_modes.phpt
@@ -24,4 +24,4 @@ array(8) {
string(3) "ofb"
[7]=>
string(6) "stream"
-} \ No newline at end of file
+}
diff --git a/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt b/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt
index c850784b8a..e5211578b0 100644
--- a/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt
@@ -19,4 +19,4 @@ array(3) {
Deprecated: Function mcrypt_module_get_supported_key_sizes() is deprecated in %s%emcrypt_module_get_supported_key_sizes.php on line 3
array(0) {
-} \ No newline at end of file
+}
diff --git a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt
index 27b965b41f..83cd60ee92 100644
--- a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt
@@ -19,4 +19,4 @@ Deprecated: Function mcrypt_module_is_block_algorithm() is deprecated in %s%emcr
bool(false)
Deprecated: Function mcrypt_module_is_block_algorithm() is deprecated in %s%emcrypt_module_is_block_algorithm.php on line 5
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt
index 57d06f4df7..bca3d37507 100644
--- a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt
@@ -19,4 +19,4 @@ Deprecated: Function mcrypt_module_is_block_algorithm_mode() is deprecated in %s
bool(false)
Deprecated: Function mcrypt_module_is_block_algorithm_mode() is deprecated in %s%emcrypt_module_is_block_algorithm_mode.php on line 5
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt b/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt
index 117c1dd593..5d313f2c6b 100644
--- a/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt
@@ -23,4 +23,4 @@ Deprecated: Function mcrypt_module_is_block_mode() is deprecated in %s%emcrypt_m
bool(false)
Deprecated: Function mcrypt_module_is_block_mode() is deprecated in %s%emcrypt_module_is_block_mode.php on line 6
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_module_open.phpt b/ext/mcrypt/tests/mcrypt_module_open.phpt
index f8a10616a3..af0f17b546 100644
--- a/ext/mcrypt/tests/mcrypt_module_open.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_open.phpt
@@ -6,7 +6,6 @@ mcrypt_module_open
<?php
var_dump(mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, ''));
mcrypt_module_open('', '', '', '');
-
--EXPECTF--
Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_module_open.php on line 2
resource(%d) of type (mcrypt)
@@ -14,4 +13,3 @@ resource(%d) of type (mcrypt)
Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_module_open.php on line 3
Warning: mcrypt_module_open(): Could not open encryption module in %s on line %d
-
diff --git a/ext/mcrypt/tests/mcrypt_ofb.phpt b/ext/mcrypt/tests/mcrypt_ofb.phpt
index 76f7fe61c8..bc52be2294 100644
--- a/ext/mcrypt/tests/mcrypt_ofb.phpt
+++ b/ext/mcrypt/tests/mcrypt_ofb.phpt
@@ -16,7 +16,6 @@ echo trim(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_OFB, $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_OFB);
-
--EXPECTF--
Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_ofb.php on line 6