summaryrefslogtreecommitdiff
path: root/ext/openssl/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/openssl/tests')
-rw-r--r--ext/openssl/tests/001.phpt2
-rw-r--r--ext/openssl/tests/bug54992.phpt2
-rw-r--r--ext/openssl/tests/bug61124.phpt1
-rw-r--r--ext/openssl/tests/bug61930.phpt1
-rw-r--r--ext/openssl/tests/bug68265.phpt1
-rw-r--r--ext/openssl/tests/bug68879.phpt1
-rw-r--r--ext/openssl/tests/bug69215.phpt1
-rw-r--r--ext/openssl/tests/bug71475.phpt1
-rw-r--r--ext/openssl/tests/bug72333.phpt1
-rw-r--r--ext/openssl/tests/bug74651.phpt2
-rw-r--r--ext/openssl/tests/bug74720_0.phpt1
-rw-r--r--ext/openssl/tests/bug74720_1.phpt1
-rw-r--r--ext/openssl/tests/bug74903.phpt1
-rw-r--r--ext/openssl/tests/bug76296.phpt1
-rw-r--r--ext/openssl/tests/openssl_csr_sign_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_decrypt_error.phpt1
-rw-r--r--ext/openssl/tests/openssl_encrypt_crash.phpt3
-rw-r--r--ext/openssl/tests/openssl_pkcs7_read_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_pkey_new_error.phpt2
-rw-r--r--ext/openssl/tests/openssl_public_encrypt_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt2
-rw-r--r--ext/openssl/tests/openssl_x509_fingerprint_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_x509_read_basic.phpt1
-rw-r--r--ext/openssl/tests/stream_crypto_flags_002.phpt1
-rw-r--r--ext/openssl/tests/stream_crypto_flags_003.phpt1
25 files changed, 4 insertions, 28 deletions
diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt
index 77b0f32183..6e74ba7f46 100644
--- a/ext/openssl/tests/001.phpt
+++ b/ext/openssl/tests/001.phpt
@@ -74,4 +74,4 @@ OK!
<?php
$key_file_name = __DIR__ . DIRECTORY_SEPARATOR . '001-tmp.key';
@unlink($key_file_name);
-?> \ No newline at end of file
+?>
diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt
index c07bbf8cba..94ebf12aea 100644
--- a/ext/openssl/tests/bug54992.phpt
+++ b/ext/openssl/tests/bug54992.phpt
@@ -45,5 +45,3 @@ Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
bool(false)
-
-
diff --git a/ext/openssl/tests/bug61124.phpt b/ext/openssl/tests/bug61124.phpt
index 9c7d0ac483..e10334fabf 100644
--- a/ext/openssl/tests/bug61124.phpt
+++ b/ext/openssl/tests/bug61124.phpt
@@ -6,7 +6,6 @@ if (!extension_loaded("openssl")) die("skip");
--FILE--
<?php
var_dump(openssl_decrypt('kzo w2RMExUTYQXW2Xzxmg==', 'aes-128-cbc', 'pass', false, 'pass'));
-
--EXPECTF--
Warning: openssl_decrypt(): IV passed is only 4 bytes long, cipher expects an IV of precisely 16 bytes, padding with \0 in %s on line %d
bool(false)
diff --git a/ext/openssl/tests/bug61930.phpt b/ext/openssl/tests/bug61930.phpt
index 6d8742b80d..c79f51eeef 100644
--- a/ext/openssl/tests/bug61930.phpt
+++ b/ext/openssl/tests/bug61930.phpt
@@ -23,4 +23,3 @@ var_dump(openssl_verify($data, base64_decode($sig), $key));
--EXPECTF--
resource(%d) of type (OpenSSL key)
int(1)
-
diff --git a/ext/openssl/tests/bug68265.phpt b/ext/openssl/tests/bug68265.phpt
index f2c867670a..736ff290a2 100644
--- a/ext/openssl/tests/bug68265.phpt
+++ b/ext/openssl/tests/bug68265.phpt
@@ -40,4 +40,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECTF--
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/bug68879.phpt b/ext/openssl/tests/bug68879.phpt
index 8cf9044c93..1f135ee50a 100644
--- a/ext/openssl/tests/bug68879.phpt
+++ b/ext/openssl/tests/bug68879.phpt
@@ -40,4 +40,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECTF--
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/bug69215.phpt b/ext/openssl/tests/bug69215.phpt
index ab9eec6770..7cd1df12db 100644
--- a/ext/openssl/tests/bug69215.phpt
+++ b/ext/openssl/tests/bug69215.phpt
@@ -47,4 +47,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECTF--
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt
index 659544297b..5df8ac27c6 100644
--- a/ext/openssl/tests/bug71475.phpt
+++ b/ext/openssl/tests/bug71475.phpt
@@ -11,6 +11,5 @@ openssl_seal($_, $_, $_, array_fill(0,64,0));
?>
DONE
--EXPECTF--
-
Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d
DONE
diff --git a/ext/openssl/tests/bug72333.phpt b/ext/openssl/tests/bug72333.phpt
index e478e3b925..7fc79846a1 100644
--- a/ext/openssl/tests/bug72333.phpt
+++ b/ext/openssl/tests/bug72333.phpt
@@ -65,4 +65,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECT--
done
-
diff --git a/ext/openssl/tests/bug74651.phpt b/ext/openssl/tests/bug74651.phpt
index f86394bdd5..b4e50a0421 100644
--- a/ext/openssl/tests/bug74651.phpt
+++ b/ext/openssl/tests/bug74651.phpt
@@ -14,4 +14,4 @@ var_dump(openssl_seal($inputstr, $sealed, $ekeys, array($pub_key_id, $pub_key_id
?>
--EXPECTF--
resource(%d) of type (OpenSSL key)
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/openssl/tests/bug74720_0.phpt b/ext/openssl/tests/bug74720_0.phpt
index b6b4b35d62..f85d83860c 100644
--- a/ext/openssl/tests/bug74720_0.phpt
+++ b/ext/openssl/tests/bug74720_0.phpt
@@ -90,4 +90,3 @@ int(39)
int(39)
int(39)
==DONE==
-
diff --git a/ext/openssl/tests/bug74720_1.phpt b/ext/openssl/tests/bug74720_1.phpt
index eb0d1f5c56..231a083b76 100644
--- a/ext/openssl/tests/bug74720_1.phpt
+++ b/ext/openssl/tests/bug74720_1.phpt
@@ -83,4 +83,3 @@ unlink($outPath);
--EXPECT--
bool(true)
==DONE==
-
diff --git a/ext/openssl/tests/bug74903.phpt b/ext/openssl/tests/bug74903.phpt
index 7a20b8693d..41f0416fee 100644
--- a/ext/openssl/tests/bug74903.phpt
+++ b/ext/openssl/tests/bug74903.phpt
@@ -80,4 +80,3 @@ unlink($tmpFileOut);
bool(true)
bool(true)
==DONE==
-
diff --git a/ext/openssl/tests/bug76296.phpt b/ext/openssl/tests/bug76296.phpt
index 59a73b7d7b..41e3b9984e 100644
--- a/ext/openssl/tests/bug76296.phpt
+++ b/ext/openssl/tests/bug76296.phpt
@@ -15,7 +15,6 @@ ini_set('open_basedir', $dir);
var_dump(openssl_pkey_get_public($pem));
?>
--EXPECTF--
-
Warning: openssl_pkey_get_public(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d
bool(false)
--CLEAN--
diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt
index 4a8e9dd67f..57c9e75c0e 100644
--- a/ext/openssl/tests/openssl_csr_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt
@@ -79,4 +79,3 @@ bool(false)
Warning: openssl_csr_sign() expects parameter 4 to be int, array given in %s on line %d
NULL
resource(%d) of type (OpenSSL X.509)
-
diff --git a/ext/openssl/tests/openssl_decrypt_error.phpt b/ext/openssl/tests/openssl_decrypt_error.phpt
index eab67f403c..be40f8080f 100644
--- a/ext/openssl/tests/openssl_decrypt_error.phpt
+++ b/ext/openssl/tests/openssl_decrypt_error.phpt
@@ -27,7 +27,6 @@ var_dump(openssl_decrypt($encrypted, $method, array()));
var_dump(openssl_encrypt($data, $method, $password, 0, $iv, $wrong));
?>
--EXPECTF--
-
Warning: openssl_encrypt(): Using an empty Initialization Vector (iv) is potentially insecure and not recommended in %s on line %d
string(44) "yof6cPPH4mLee6TOc0YQSrh4dvywMqxGUyjp0lV6+aM="
string(44) "yof6cPPH4mLee6TOc0YQSrh4dvywMqxGUyjp0lV6+aM="
diff --git a/ext/openssl/tests/openssl_encrypt_crash.phpt b/ext/openssl/tests/openssl_encrypt_crash.phpt
index b88782b0b2..cf2d7f823a 100644
--- a/ext/openssl/tests/openssl_encrypt_crash.phpt
+++ b/ext/openssl/tests/openssl_encrypt_crash.phpt
@@ -8,6 +8,5 @@ openssl_encrypt('', 'AES-128-CBC', 'foo');
var_dump("done");
?>
--EXPECTF--
-
Warning: openssl_encrypt(): Using an empty Initialization Vector (iv) is potentially insecure and not recommended in %s on line %d
-string(4) "done" \ No newline at end of file
+string(4) "done"
diff --git a/ext/openssl/tests/openssl_pkcs7_read_basic.phpt b/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
index 052779dc0a..64c7c2c130 100644
--- a/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
@@ -16,7 +16,6 @@ var_dump(openssl_pkcs7_read($infile, $result));
var_dump($result);
?>
--EXPECTF--
-
Warning: openssl_pkcs7_read() expects exactly 2 parameters, 0 given in %s on line %d
NULL
diff --git a/ext/openssl/tests/openssl_pkey_new_error.phpt b/ext/openssl/tests/openssl_pkey_new_error.phpt
index 0316c5d7a1..c7dc193d53 100644
--- a/ext/openssl/tests/openssl_pkey_new_error.phpt
+++ b/ext/openssl/tests/openssl_pkey_new_error.phpt
@@ -16,10 +16,8 @@ openssl_pkey_get_details(openssl_pkey_new($dsa));
openssl_pkey_get_details(openssl_pkey_new($dh));
?>
--EXPECTF--
-
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
-
diff --git a/ext/openssl/tests/openssl_public_encrypt_basic.phpt b/ext/openssl/tests/openssl_public_encrypt_basic.phpt
index e9d47c26b0..69650a65d9 100644
--- a/ext/openssl/tests/openssl_public_encrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_public_encrypt_basic.phpt
@@ -37,4 +37,3 @@ Warning: openssl_public_encrypt(): key parameter is not a valid public key in %s
bool(false)
bool(true)
string(4) "test"
-
diff --git a/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt b/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
index 68c11dde2c..5727de90a2 100644
--- a/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
+++ b/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
@@ -19,4 +19,4 @@ string(10) "%s"
string(12) "%s"
string(14) "%s"
string(16) "%s"
-string(18) "%s" \ No newline at end of file
+string(18) "%s"
diff --git a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
index f47255ac1b..ceaafc2234 100644
--- a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
@@ -49,4 +49,3 @@ bool(false)
Warning: openssl_x509_fingerprint(): Unknown signature algorithm in %s on line %d
bool(false)
-
diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt
index 72a62f7079..062c6bf1cb 100644
--- a/ext/openssl/tests/openssl_x509_read_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_read_basic.phpt
@@ -34,4 +34,3 @@ bool(false)
Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d
bool(false)
-
diff --git a/ext/openssl/tests/stream_crypto_flags_002.phpt b/ext/openssl/tests/stream_crypto_flags_002.phpt
index 379736dd81..5992612018 100644
--- a/ext/openssl/tests/stream_crypto_flags_002.phpt
+++ b/ext/openssl/tests/stream_crypto_flags_002.phpt
@@ -55,4 +55,3 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/stream_crypto_flags_003.phpt b/ext/openssl/tests/stream_crypto_flags_003.phpt
index fd6746daa0..51a8dec123 100644
--- a/ext/openssl/tests/stream_crypto_flags_003.phpt
+++ b/ext/openssl/tests/stream_crypto_flags_003.phpt
@@ -53,4 +53,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
-