Skip to content

Commit 61f25be

Browse files
GirgiasGirgias
committed
Drop unneceassry tests modifications
1 parent 39b2f92 commit 61f25be

15 files changed

+63
-267
lines changed

‎ext/openssl/tests/bug38261.phpt

+2-10
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ class test {
1414
}
1515
$t = new test;
1616

17-
try {
18-
var_dump(openssl_x509_parse("foo"));
19-
} catch (TypeError $e) {
20-
echo $e->getMessage(), "\n";
21-
}
17+
var_dump(openssl_x509_parse("foo"));
2218

2319
try {
2420
var_dump(openssl_x509_parse($t));
@@ -32,11 +28,7 @@ try {
3228
echo $e->getMessage(), "\n";
3329
}
3430

35-
try {
36-
var_dump(openssl_x509_parse($cert));
37-
} catch (TypeError $e) {
38-
echo $e->getMessage(), "\n";
39-
}
31+
var_dump(openssl_x509_parse($cert));
4032

4133
try {
4234
openssl_x509_parse(new stdClass);

‎ext/openssl/tests/cve-2013-6420.phpt

-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ CVE-2013-6420
55
--FILE--
66
<?php
77
$crt = substr(__FILE__, 0, -4).'.crt';
8-
98
$info = openssl_x509_parse("file://$crt");
10-
119
var_dump($info['issuer']['emailAddress'], $info["validFrom_time_t"]);
1210
?>
1311
--EXPECTF--

‎ext/openssl/tests/ecc.phpt

+2-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ $argsFailed = array(
1717
"private_key_type" => OPENSSL_KEYTYPE_EC,
1818
);
1919

20-
try {
21-
$keyFailed = openssl_pkey_new($argsFailed);
22-
var_dump($keyFailed);
23-
} catch (\ValueError $e) {
24-
echo $e->getMessage() . \PHP_EOL;
25-
}
20+
$keyFailed = openssl_pkey_new($argsFailed);
21+
var_dump($keyFailed);
2622

2723
$d1 = openssl_pkey_get_details($key1);
2824
var_dump($d1["bits"]);

‎ext/openssl/tests/openssl_csr_export_to_file_basic.phpt

+1-5
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ $csr = openssl_csr_new($dn, $privkey_file, $args);
3737
var_dump(openssl_csr_export_to_file($csr, $csrfile));
3838
var_dump(file_get_contents($csrfile));
3939

40-
try {
41-
var_dump(openssl_csr_export_to_file($wrong, $csrfile));
42-
} catch (TypeError $e) {
43-
echo $e->getMessage(), "\n";
44-
}
40+
var_dump(openssl_csr_export_to_file($wrong, $csrfile));
4541

4642
try {
4743
openssl_csr_export_to_file($dh, $csrfile);

‎ext/openssl/tests/openssl_pkcs12_export_basic.phpt

+3-12
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,12 @@ var_dump(openssl_pkcs12_export($cert, $output, $priv, $pass, array('extracerts'
2727
var_dump(openssl_pkcs12_read($output, $opts, $pass));
2828
var_dump(count($opts)); // should be 3 certificates, priv, pub, extra optional cert
2929

30-
try {
31-
var_dump(openssl_pkcs12_export($invalid, $output, $invalid, $pass));
32-
} catch (\TypeError $e) {
33-
echo $e->getMessage() . \PHP_EOL;
34-
}
35-
36-
try {
37-
var_dump(openssl_pkcs12_export($invalid_path, $output, $invalid_path, $pass));
38-
} catch (\TypeError $e) {
39-
echo $e->getMessage() . \PHP_EOL;
40-
}
4130

31+
var_dump(openssl_pkcs12_export($invalid, $output, $invalid, $pass));
32+
var_dump(openssl_pkcs12_export($invalid_path, $output, $invalid_path, $pass));
4233
try {
4334
var_dump(openssl_pkcs12_export($priv_res, $output, $cert_res, $pass));
44-
} catch (\TypeError $e) {
35+
} catch (TypeError $e) {
4536
echo $e->getMessage(), "\n";
4637
}
4738
//var_dump(openssl_pkcs12_export($cert, $output, $priv, $pass, array("foo")));

‎ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt

+4-15
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,12 @@ var_dump(openssl_pkcs12_read(file_get_contents($pkcsfile), $opts, $pass));
2828
var_dump(openssl_pkcs12_export_to_file($cert_res, $pkcsfile, $priv_res, $pass, array('extracerts' => $cert)));
2929
var_dump(openssl_pkcs12_read(file_get_contents($pkcsfile), $opts, $pass));
3030

31-
32-
try {
33-
var_dump(openssl_pkcs12_export_to_file($invalid, $pkcsfile, $invalid, $pass));
34-
} catch (\TypeError $e) {
35-
echo $e->getMessage() . \PHP_EOL;
36-
}
37-
38-
try {
39-
var_dump(openssl_pkcs12_export_to_file($invalid_path, $pkcsfile, $invalid_path, $pass));
40-
} catch (\TypeError $e) {
41-
echo $e->getMessage() . \PHP_EOL;
42-
}
43-
31+
var_dump(openssl_pkcs12_export_to_file($invalid, $pkcsfile, $invalid, $pass));
32+
var_dump(openssl_pkcs12_export_to_file($invalid_path, $pkcsfile, $invalid_path, $pass));
4433
try {
4534
var_dump(openssl_pkcs12_export_to_file($priv_res, $pkcsfile, $cert_res, $pass));
46-
} catch (\TypeError $e) {
47-
echo $e->getMessage() . \PHP_EOL;
35+
} catch (TypeError $e) {
36+
echo $e->getMessage(), "\n";
4837
}
4938
?>
5039
--CLEAN--

‎ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt

+3-19
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,12 @@ openssl_pkcs7_encrypt($infile, $encrypted, $single_cert, $headers);
2424
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $single_cert, $privkey));
2525
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, openssl_x509_read($single_cert), $privkey));
2626
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $single_cert, $wrong));
27-
28-
try {
29-
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $wrong, $privkey));
30-
} catch (\TypeError $e) {
31-
echo $e->getMessage() . \PHP_EOL;
32-
}
33-
try {
34-
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, null, $privkey));
35-
} catch (\TypeError $e) {
36-
echo $e->getMessage() . \PHP_EOL;
37-
}
38-
27+
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $wrong, $privkey));
28+
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, null, $privkey));
3929
var_dump(openssl_pkcs7_decrypt($wrong, $outfile, $single_cert, $privkey));
4030
var_dump(openssl_pkcs7_decrypt($empty, $outfile, $single_cert, $privkey));
4131
var_dump(openssl_pkcs7_decrypt($encrypted, $empty, $single_cert, $privkey));
42-
43-
try {
44-
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $empty, $privkey));
45-
} catch (\TypeError $e) {
46-
echo $e->getMessage() . \PHP_EOL;
47-
}
48-
32+
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $empty, $privkey));
4933
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $single_cert, $empty));
5034

5135
if (file_exists($encrypted)) {

‎ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt

+16-30
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ openssl_pkcs7_decrypt() and invalid parameters
55
--FILE--
66
<?php
77

8+
function myErrorHandler($errno, $errstr, $errfile, $errline) {
9+
var_dump($errstr);
10+
}
11+
set_error_handler("myErrorHandler");
12+
813
$a = 1;
914
$b = 1;
1015
$c = new stdclass;
@@ -17,42 +22,23 @@ try {
1722
}
1823
var_dump($c);
1924

20-
try {
21-
var_dump(openssl_pkcs7_decrypt($b, $b, $b, $b));
22-
} catch (\TypeError $e) {
23-
echo $e->getMessage() . \PHP_EOL;
24-
}
25-
try {
26-
var_dump(openssl_pkcs7_decrypt($a, $b, "", ""));
27-
} catch (\TypeError $e) {
28-
echo $e->getMessage() . \PHP_EOL;
29-
}
30-
try {
31-
var_dump(openssl_pkcs7_decrypt($a, $b, true, false));
32-
} catch (\TypeError $e) {
33-
echo $e->getMessage() . \PHP_EOL;
34-
}
35-
try {
36-
var_dump(openssl_pkcs7_decrypt($a, $b, 0, 0));
37-
} catch (\TypeError $e) {
38-
echo $e->getMessage() . \PHP_EOL;
39-
}
25+
var_dump(openssl_pkcs7_decrypt($b, $b, $b, $b));
26+
var_dump(openssl_pkcs7_decrypt($a, $b, "", ""));
27+
var_dump(openssl_pkcs7_decrypt($a, $b, true, false));
28+
var_dump(openssl_pkcs7_decrypt($a, $b, 0, 0));
4029

30+
echo "Done\n";
4131
?>
42-
--EXPECTF--
43-
Warning: openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved in %s on line %d
32+
--EXPECT--
4433
Object of class stdClass could not be converted to string
4534
object(stdClass)#1 (0) {
4635
}
47-
48-
Warning: openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved in %s on line %d
36+
string(62) "openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved"
4937
bool(false)
50-
51-
Warning: openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved in %s on line %d
38+
string(62) "openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved"
5239
bool(false)
53-
54-
Warning: openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved in %s on line %d
40+
string(62) "openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved"
5541
bool(false)
56-
57-
Warning: openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved in %s on line %d
42+
string(62) "openssl_pkcs7_decrypt(): X.509 Certificate cannot be retrieved"
5843
bool(false)
44+
Done

‎ext/openssl/tests/openssl_pkcs7_sign_basic.phpt

+2-12
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,8 @@ var_dump(openssl_pkcs7_sign($infile, $outfile, $single_cert, $privkey, $empty_he
2525
var_dump(openssl_pkcs7_sign($wrong, $outfile, $single_cert, $privkey, $headers));
2626
var_dump(openssl_pkcs7_sign($empty, $outfile, $single_cert, $privkey, $headers));
2727
var_dump(openssl_pkcs7_sign($infile, $empty, $single_cert, $privkey, $headers));
28-
29-
try {
30-
var_dump(openssl_pkcs7_sign($infile, $outfile, $wrong, $privkey, $headers));
31-
} catch (\TypeError $e) {
32-
echo $e->getMessage() . \PHP_EOL;
33-
}
34-
try {
35-
var_dump(openssl_pkcs7_sign($infile, $outfile, $empty, $privkey, $headers));
36-
} catch (\TypeError $e) {
37-
echo $e->getMessage() . \PHP_EOL;
38-
}
39-
28+
var_dump(openssl_pkcs7_sign($infile, $outfile, $wrong, $privkey, $headers));
29+
var_dump(openssl_pkcs7_sign($infile, $outfile, $empty, $privkey, $headers));
4030
var_dump(openssl_pkcs7_sign($infile, $outfile, $single_cert, $wrong, $headers));
4131

4232
if (file_exists($outfile)) {

‎ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt

+21-111
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,13 @@ var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_SIGN));
2323
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_ENCRYPT));
2424
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_CRL_SIGN));
2525
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_ANY));
26-
27-
try {
28-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_CLIENT));
29-
} catch (\TypeError $e) {
30-
echo $e->getMessage() . \PHP_EOL;
31-
}
32-
try {
33-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_SERVER));
34-
} catch (\TypeError $e) {
35-
echo $e->getMessage() . \PHP_EOL;
36-
}
37-
try {
38-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_NS_SSL_SERVER));
39-
} catch (\TypeError $e) {
40-
echo $e->getMessage() . \PHP_EOL;
41-
}
42-
try {
43-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_SIGN));
44-
} catch (\TypeError $e) {
45-
echo $e->getMessage() . \PHP_EOL;
46-
}
47-
try {
48-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_ENCRYPT));
49-
} catch (\TypeError $e) {
50-
echo $e->getMessage() . \PHP_EOL;
51-
}
52-
try {
53-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_CRL_SIGN));
54-
} catch (\TypeError $e) {
55-
echo $e->getMessage() . \PHP_EOL;
56-
}
57-
try {
58-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_ANY));
59-
} catch (\TypeError $e) {
60-
echo $e->getMessage() . \PHP_EOL;
61-
}
62-
26+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_CLIENT));
27+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_SERVER));
28+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_NS_SSL_SERVER));
29+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_SIGN));
30+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_ENCRYPT));
31+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_CRL_SIGN));
32+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_ANY));
6333
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SSL_CLIENT));
6434
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SSL_SERVER));
6535
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_NS_SSL_SERVER));
@@ -76,43 +46,13 @@ var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_SIGN, array($cpca))
7646
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_ENCRYPT, array($cpca)));
7747
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_CRL_SIGN, array($cpca)));
7848
var_dump(openssl_x509_checkpurpose($rcrt, X509_PURPOSE_ANY, array($cpca)));
79-
80-
try {
81-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_CLIENT, array($cpca)));
82-
} catch (\TypeError $e) {
83-
echo $e->getMessage() . \PHP_EOL;
84-
}
85-
try {
86-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_SERVER, array($cpca)));
87-
} catch (\TypeError $e) {
88-
echo $e->getMessage() . \PHP_EOL;
89-
}
90-
try {
91-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_NS_SSL_SERVER, array($cpca)));
92-
} catch (\TypeError $e) {
93-
echo $e->getMessage() . \PHP_EOL;
94-
}
95-
try {
96-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_SIGN, array($cpca)));
97-
} catch (\TypeError $e) {
98-
echo $e->getMessage() . \PHP_EOL;
99-
}
100-
try {
101-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_ENCRYPT, array($cpca)));
102-
} catch (\TypeError $e) {
103-
echo $e->getMessage() . \PHP_EOL;
104-
}
105-
try {
106-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_CRL_SIGN, array($cpca)));
107-
} catch (\TypeError $e) {
108-
echo $e->getMessage() . \PHP_EOL;
109-
}
110-
try {
111-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_ANY, array($cpca)));
112-
} catch (\TypeError $e) {
113-
echo $e->getMessage() . \PHP_EOL;
114-
}
115-
49+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_CLIENT, array($cpca)));
50+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_SERVER, array($cpca)));
51+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_NS_SSL_SERVER, array($cpca)));
52+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_SIGN, array($cpca)));
53+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_ENCRYPT, array($cpca)));
54+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_CRL_SIGN, array($cpca)));
55+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_ANY, array($cpca)));
11656
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SSL_CLIENT, array($cpca)));
11757
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SSL_SERVER, array($cpca)));
11858
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_NS_SSL_SERVER, array($cpca)));
@@ -129,43 +69,13 @@ var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_SIGN, array($cpca),
12969
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_ENCRYPT, array($cpca), $utfl));
13070
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_CRL_SIGN, array($cpca), $utfl));
13171
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_ANY, array($cpca), $utfl));
132-
133-
try {
134-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_CLIENT, array($cpca), $utfl));
135-
} catch (\TypeError $e) {
136-
echo $e->getMessage() . \PHP_EOL;
137-
}
138-
try {
139-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_SERVER, array($cpca), $utfl));
140-
} catch (\TypeError $e) {
141-
echo $e->getMessage() . \PHP_EOL;
142-
}
143-
try {
144-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_NS_SSL_SERVER, array($cpca), $utfl));
145-
} catch (\TypeError $e) {
146-
echo $e->getMessage() . \PHP_EOL;
147-
}
148-
try {
149-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_SIGN, array($cpca), $utfl));
150-
} catch (\TypeError $e) {
151-
echo $e->getMessage() . \PHP_EOL;
152-
}
153-
try {
154-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_ENCRYPT, array($cpca), $utfl));
155-
} catch (\TypeError $e) {
156-
echo $e->getMessage() . \PHP_EOL;
157-
}
158-
try {
159-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_CRL_SIGN, array($cpca), $utfl));
160-
} catch (\TypeError $e) {
161-
echo $e->getMessage() . \PHP_EOL;
162-
}
163-
try {
164-
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_ANY, array($cpca), $utfl));
165-
} catch (\TypeError $e) {
166-
echo $e->getMessage() . \PHP_EOL;
167-
}
168-
72+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_CLIENT, array($cpca), $utfl));
73+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_SERVER, array($cpca), $utfl));
74+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_NS_SSL_SERVER, array($cpca), $utfl));
75+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_SIGN, array($cpca), $utfl));
76+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SMIME_ENCRYPT, array($cpca), $utfl));
77+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_CRL_SIGN, array($cpca), $utfl));
78+
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_ANY, array($cpca), $utfl));
16979
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SSL_CLIENT, array($cpca), $utfl));
17080
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SSL_SERVER, array($cpca), $utfl));
17181
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_NS_SSL_SERVER, array($cpca), $utfl));

0 commit comments

Comments
 (0)