Skip to content

Commit 19c62e8

Browse files
bukkabukka
committed
Merge branch 'PHP-7.1' into PHP-7.2
2 parents ccba0f5 + 7c2031b commit 19c62e8

15 files changed

+209
-28
lines changed

‎ext/openssl/openssl.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -1676,10 +1676,11 @@ static X509 * php_openssl_x509_from_zval(zval * val, int makeresource, zend_reso
16761676
if (!what) {
16771677
return NULL;
16781678
}
1679-
/* this is so callers can decide if they should free the X509 */
16801679
if (resourceval) {
16811680
*resourceval = res;
1682-
Z_ADDREF_P(val);
1681+
if (makeresource) {
1682+
Z_ADDREF_P(val);
1683+
}
16831684
}
16841685
return (X509*)what;
16851686
}
@@ -3225,7 +3226,9 @@ static X509_REQ * php_openssl_csr_from_zval(zval * val, int makeresource, zend_r
32253226
if (what) {
32263227
if (resourceval) {
32273228
*resourceval = res;
3228-
Z_ADDREF_P(val);
3229+
if (makeresource) {
3230+
Z_ADDREF_P(val);
3231+
}
32293232
}
32303233
return (X509_REQ*)what;
32313234
}

‎ext/openssl/tests/001.phpt

+2-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ if (!@openssl_pkey_new()) die("skip cannot create private key");
99
<?php
1010
echo "Creating private key\n";
1111

12-
/* stack up some entropy; performance is not critical,
13-
* and being slow will most likely even help the test.
14-
*/
15-
for ($z = "", $i = 0; $i < 1024; $i++) {
16-
$z .= $i * $i;
17-
if (function_exists("usleep"))
18-
usleep($i);
19-
}
20-
2112
$conf = array('config' => dirname(__FILE__) . DIRECTORY_SEPARATOR . 'openssl.cnf');
2213
$privkey = openssl_pkey_new($conf);
2314

@@ -32,6 +23,7 @@ if ($key_file_name === false)
3223
echo "Export key to file\n";
3324

3425
openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase, $conf) or die("failed to export to file $key_file_name");
26+
var_dump(is_resource($privkey));
3527

3628
echo "Load key from file - array syntax\n";
3729

@@ -69,6 +61,7 @@ echo "OK!\n";
6961
--EXPECT--
7062
Creating private key
7163
Export key to file
64+
bool(true)
7265
Load key from file - array syntax
7366
Load key using direct syntax
7467
Load key manually and use string syntax

‎ext/openssl/tests/openssl_csr_export_to_file_basic.phpt

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
--TEST--
2+
openssl_csr_export_to_file() tests
3+
--SKIPIF--
4+
<?php if (!extension_loaded("openssl")) print "skip"; ?>
5+
--FILE--
6+
<?php
7+
$csrfile = dirname(__FILE__) . "/openssl_csr_export_to_file_csr.tmp";
8+
$wrong = "wrong";
9+
$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
10+
$phex = 'dcf93a0b883972ec0e19989ac5a2ce310e1d37717e8d9571bb7623731866e61e' .
11+
'f75a2e27898b057f9891c2e27a639c3f29b60814581cd3b2ca3986d268370557' .
12+
'7d45c2e7e52dc81c7a171876e5cea74b1448bfdfaf18828efd2519f14e45e382' .
13+
'6634af1949e5b535cc829a483b8a76223e5d490a257f05bdff16f2fb22c583ab';
14+
$dh_details = array('p' => $phex, 'g' => '2');
15+
$dh = openssl_pkey_new(array(
16+
'dh'=> array('p' => hex2bin($phex), 'g' => '2'))
17+
);
18+
19+
$dn = array(
20+
"countryName" => "BR",
21+
"stateOrProvinceName" => "Rio Grande do Sul",
22+
"localityName" => "Porto Alegre",
23+
"commonName" => "Henrique do N. Angelo",
24+
"emailAddress" => "[email protected]"
25+
);
26+
27+
$args = array(
28+
"digest_alg" => "sha1",
29+
"private_key_bits" => 2048,
30+
"private_key_type" => OPENSSL_KEYTYPE_DSA,
31+
"encrypt_key" => true,
32+
"config" => $config,
33+
);
34+
35+
$privkey_file = 'file://' . dirname(__FILE__) . '/private_rsa_2048.key';
36+
$csr = openssl_csr_new($dn, $privkey_file, $args);
37+
var_dump(openssl_csr_export_to_file($csr, $csrfile));
38+
var_dump(file_get_contents($csrfile));
39+
var_dump(openssl_csr_export_to_file($wrong, $csrfile));
40+
var_dump(openssl_csr_export_to_file($dh, $csrfile));
41+
var_dump(openssl_csr_export_to_file(array(), $csrfile));
42+
var_dump(openssl_csr_export_to_file($csr, $csrfile, false));
43+
?>
44+
--CLEAN--
45+
<?php
46+
$csrfile = dirname(__FILE__) . "/openssl_csr_export_to_file_csr.tmp";
47+
if (file_exists($csrfile)) {
48+
unlink($csrfile);
49+
}
50+
?>
51+
--EXPECTF--
52+
bool(true)
53+
string(1086) "-----BEGIN CERTIFICATE REQUEST-----
54+
MIIC6jCCAdICAQAwgaQxCzAJBgNVBAYTAkJSMRowGAYDVQQIExFSaW8gR3JhbmRl
55+
IGRvIFN1bDEVMBMGA1UEBxMMUG9ydG8gQWxlZ3JlMR4wHAYDVQQDExVIZW5yaXF1
56+
ZSBkbyBOLiBBbmdlbG8xHzAdBgkqhkiG9w0BCQEWEGhuYW5nZWxvQHBocC5uZXQx
57+
ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN
58+
AQEBBQADggEPADCCAQoCggEBAK21JlVtWPqyc2UQtw2AdJHSIL5OzAHWsu/Mmxjz
59+
w4VZWwG+Ao1m2j7OJ8lAkxLfSlRtB+6Vx8Q21krAtve+M3b6pT9C9qKdfzNkrXk3
60+
BggTncBh9ozkVQGS/P1m0zn/SKSgDO+6DdeLHLMjpUASaoYfsay4PJLAdnTqLOeM
61+
g6qNE6u0ebZXVfmpSmV1pSZ6kQnxbsb6rX1iOZxkwHnVWYb40Hy0EILo31x6BVqB
62+
m159m7s38ChiRHqlj20DmRfxXjiT5YDgYYQ29wQBTVQrTN5O9UW5Y+eKTXd8r6te
63+
dsbIBXdKN7NeX7ksGYHq1I3hLsP8EyvZO78qfjKyEB0Jj3UCAwEAAaAAMA0GCSqG
64+
SIb3DQEBBQUAA4IBAQCamzVmIbElkiDQKzQpkfU5tHjrWPrHDSB186NI0sQ8i6GQ
65+
1YT6yPAXBPTQ1aER/6uAZJL5HfWEX8V1rKbe8GkPAPCHHQzmHyWlaO2EHS57zJhk
66+
sRrhqkhhkSNiDg4OrsguhRtbB2VMGeDbqHGI89uGqqGHUiZc/Bh8N7WFXZkUU/A0
67+
sfBgVeqg0P4SWez5fHXqBNcjMdMI5f0bikcDZSIfTHS8FX+PMurLBC8UPB0YNIOl
68+
1r2Lvo+6YUHOziG1OwQd3K0xxu/JzzOE+lMB73ynz4V6DY5Qv3qVno1GpupvgmQA
69+
JViHkCA9x6m8RJXAFvqmgLlWlUzbDv/cRrDfjWjR
70+
-----END CERTIFICATE REQUEST-----
71+
"
72+
73+
Warning: openssl_csr_export_to_file() expects parameter 1 to be resource, string given in %s on line %d
74+
NULL
75+
76+
Warning: openssl_csr_export_to_file(): supplied resource is not a valid OpenSSL X.509 CSR resource in %s on line %d
77+
78+
Warning: openssl_csr_export_to_file(): cannot get CSR from parameter 1 in %s on line %d
79+
bool(false)
80+
81+
Warning: openssl_csr_export_to_file() expects parameter 1 to be resource, array given in %s on line %d
82+
NULL
83+
bool(true)

‎ext/openssl/tests/openssl_csr_get_public_key_basic.phpt

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
--TEST--
2+
openssl_csr_get_public_key() tests
3+
--SKIPIF--
4+
<?php
5+
if (!extension_loaded("openssl")) die("skip");
6+
?>
7+
--FILE--
8+
<?php
9+
$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
10+
$phex = 'dcf93a0b883972ec0e19989ac5a2ce310e1d37717e8d9571bb7623731866e61e' .
11+
'f75a2e27898b057f9891c2e27a639c3f29b60814581cd3b2ca3986d268370557' .
12+
'7d45c2e7e52dc81c7a171876e5cea74b1448bfdfaf18828efd2519f14e45e382' .
13+
'6634af1949e5b535cc829a483b8a76223e5d490a257f05bdff16f2fb22c583ab';
14+
$dh_details = array('p' => $phex, 'g' => '2');
15+
$dh = openssl_pkey_new(array(
16+
'dh'=> array('p' => hex2bin($phex), 'g' => '2'))
17+
);
18+
19+
$dn = array(
20+
"countryName" => "BR",
21+
"stateOrProvinceName" => "Rio Grande do Sul",
22+
"localityName" => "Porto Alegre",
23+
"commonName" => "Henrique do N. Angelo",
24+
"emailAddress" => "[email protected]"
25+
);
26+
27+
$args = array(
28+
"digest_alg" => "sha1",
29+
"private_key_bits" => 2048,
30+
"private_key_type" => OPENSSL_KEYTYPE_DSA,
31+
"encrypt_key" => true,
32+
"config" => $config,
33+
);
34+
35+
$privkey_file = 'file://' . dirname(__FILE__) . '/private_rsa_2048.key';
36+
$csr = openssl_csr_new($dn, $privkey_file, $args);
37+
$csr_file = file_get_contents(dirname(__FILE__) . '/cert.csr');
38+
39+
var_dump(openssl_csr_get_public_key($csr));
40+
var_dump(openssl_csr_get_public_key($csr_file));
41+
?>
42+
--EXPECTF--
43+
resource(%d) of type (OpenSSL key)
44+
resource(%d) of type (OpenSSL key)

‎ext/openssl/tests/openssl_csr_get_subject_basic.phpt

+47-11
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,43 @@
22
openssl_csr_get_subject() tests
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded("openssl")) die("skip");
6-
if (!function_exists("utf8_decode")) die("skip");
5+
if (!extension_loaded("openssl")) die("skip");
76
?>
87
--FILE--
98
<?php
9+
$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
10+
$phex = 'dcf93a0b883972ec0e19989ac5a2ce310e1d37717e8d9571bb7623731866e61e' .
11+
'f75a2e27898b057f9891c2e27a639c3f29b60814581cd3b2ca3986d268370557' .
12+
'7d45c2e7e52dc81c7a171876e5cea74b1448bfdfaf18828efd2519f14e45e382' .
13+
'6634af1949e5b535cc829a483b8a76223e5d490a257f05bdff16f2fb22c583ab';
14+
$dh_details = array('p' => $phex, 'g' => '2');
15+
$dh = openssl_pkey_new(array(
16+
'dh'=> array('p' => hex2bin($phex), 'g' => '2'))
17+
);
1018

11-
$csr = file_get_contents(dirname(__FILE__) . '/cert.csr');
12-
if ($out = openssl_csr_get_subject($csr, 1)) {
13-
var_dump($out);
14-
}
15-
echo "\n";
16-
$cn = utf8_decode($out['CN']);
17-
var_dump($cn);
19+
$dn = array(
20+
"countryName" => "BR",
21+
"stateOrProvinceName" => "Rio Grande do Sul",
22+
"localityName" => "Porto Alegre",
23+
"commonName" => "Henrique do N. Angelo",
24+
"emailAddress" => "[email protected]"
25+
);
26+
27+
$args = array(
28+
"digest_alg" => "sha1",
29+
"private_key_bits" => 2048,
30+
"private_key_type" => OPENSSL_KEYTYPE_DSA,
31+
"encrypt_key" => true,
32+
"config" => $config,
33+
);
34+
35+
$privkey_file = 'file://' . dirname(__FILE__) . '/private_rsa_2048.key';
36+
$csr = openssl_csr_new($dn, $privkey_file, $args);
37+
$csr_file = file_get_contents(dirname(__FILE__) . '/cert.csr');
38+
39+
var_dump(openssl_csr_get_subject($csr_file));
40+
var_dump(openssl_csr_get_subject($csr, false));
41+
?>
1842
--EXPECTF--
1943
array(6) {
2044
["C"]=>
@@ -30,5 +54,17 @@ array(6) {
3054
["CN"]=>
3155
string(15) "*.triconnect.nl"
3256
}
33-
34-
string(15) "*.triconnect.nl"
57+
array(6) {
58+
["countryName"]=>
59+
string(2) "BR"
60+
["stateOrProvinceName"]=>
61+
string(17) "Rio Grande do Sul"
62+
["localityName"]=>
63+
string(12) "Porto Alegre"
64+
["commonName"]=>
65+
string(21) "Henrique do N. Angelo"
66+
["emailAddress"]=>
67+
string(16) "[email protected]"
68+
["organizationName"]=>
69+
string(24) "Internet Widgits Pty Ltd"
70+
}

‎ext/openssl/tests/openssl_csr_sign_basic.phpt

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ $csr = openssl_csr_new($dn, $privkey, $args);
3232
var_dump(openssl_csr_sign($csr, null, $privkey, 365, $args));
3333
var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg));
3434
var_dump(openssl_csr_sign($csr, $cert, $priv, 365, $config_arg));
35+
var_dump(openssl_csr_sign($csr, openssl_x509_read($cert), $priv, 365, $config_arg));
3536
var_dump(openssl_csr_sign($csr, $wrong, $privkey, 365));
3637
var_dump(openssl_csr_sign($csr, null, $wrong, 365));
3738
var_dump(openssl_csr_sign($csr, null, $privkey, $wrong));
@@ -47,6 +48,7 @@ var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg));
4748
resource(%d) of type (OpenSSL X.509)
4849
resource(%d) of type (OpenSSL X.509)
4950
resource(%d) of type (OpenSSL X.509)
51+
resource(%d) of type (OpenSSL X.509)
5052

5153
Warning: openssl_csr_sign(): cannot get cert from parameter 2 in %s on line %d
5254
bool(false)

‎ext/openssl/tests/openssl_pkcs12_export_basic.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $cert_res = openssl_x509_read($cert);
1414
$priv_res = openssl_pkey_get_private($priv);
1515
$pass = "test";
1616
$invalid = "";
17-
$invalid_path = "file:///tmp/php";
17+
$invalid_path = dirname(__FILE__) . "/invalid_path";
1818
$opts = [];
1919

2020
var_dump(openssl_pkcs12_export($cert, $output, $priv, $pass)); // read certs as a string

‎ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $empty = "";
2222

2323
openssl_pkcs7_encrypt($infile, $encrypted, $single_cert, $headers);
2424
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $single_cert, $privkey));
25+
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, openssl_x509_read($single_cert), $privkey));
2526
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $single_cert, $wrong));
2627
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $wrong, $privkey));
2728
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, null, $privkey));
@@ -42,6 +43,7 @@ if (file_exists($outfile)) {
4243
?>
4344
--EXPECTF--
4445
bool(true)
46+
bool(true)
4547

4648
Warning: openssl_pkcs7_decrypt(): unable to get private key in %s on line %d
4749
bool(false)

‎ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $wrong = "wrong";
2222
$empty = "";
2323

2424
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $headers));
25+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, openssl_x509_read($single_cert), $headers));
2526
var_dump(openssl_pkcs7_decrypt($outfile, $outfile2, $single_cert, $privkey));
2627
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $assoc_headers));
2728
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $empty_headers));
@@ -33,6 +34,7 @@ var_dump(openssl_pkcs7_encrypt($infile, $outfile, $wrong, $headers));
3334
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $empty, $headers));
3435
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $empty));
3536
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $multi_certs, $headers));
37+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, array_map('openssl_x509_read', $multi_certs) , $headers));
3638

3739
if (file_exists($outfile)) {
3840
echo "true\n";
@@ -48,6 +50,7 @@ bool(true)
4850
bool(true)
4951
bool(true)
5052
bool(true)
53+
bool(true)
5154

5255
Warning: openssl_pkcs7_encrypt() expects parameter 4 to be array, string given in %s on line %d
5356
bool(false)
@@ -60,5 +63,6 @@ bool(false)
6063
Warning: openssl_pkcs7_encrypt() expects parameter 4 to be array, string given in %s on line %d
6164
bool(false)
6265
bool(true)
66+
bool(true)
6367
true
6468
true

‎ext/openssl/tests/openssl_pkcs7_sign_basic.phpt

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ $empty_headers = array();
1818
$wrong = "wrong";
1919
$empty = "";
2020

21+
var_dump(openssl_pkcs7_sign($infile, $outfile, openssl_x509_read($single_cert), $privkey, $headers));
2122
var_dump(openssl_pkcs7_sign($infile, $outfile, $single_cert, $privkey, $headers));
2223
var_dump(openssl_pkcs7_sign($infile, $outfile, $single_cert, $privkey, $assoc_headers));
2324
var_dump(openssl_pkcs7_sign($infile, $outfile, $single_cert, $privkey, $empty_headers));
@@ -39,6 +40,7 @@ if (file_exists($outfile)) {
3940
bool(true)
4041
bool(true)
4142
bool(true)
43+
bool(true)
4244

4345
Warning: openssl_pkcs7_sign() expects parameter 5 to be array, string given in %s on line %d
4446
NULL

‎ext/openssl/tests/openssl_pkey_export_basic.phpt

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $tempname = tempnam(sys_get_temp_dir(), 'openssl_ec');
3939
var_dump(openssl_pkey_export_to_file($key, $tempname, NULL, $config_arg));
4040
$details = openssl_pkey_get_details(openssl_pkey_get_private('file://' . $tempname));
4141
var_dump(OPENSSL_KEYTYPE_EC === $details['type']);
42-
42+
var_dump(is_resource($key));
4343
// Clean the temporary file
4444
@unlink($tempname);
4545
?>
@@ -56,3 +56,4 @@ array(1) {
5656
}
5757
bool(true)
5858
bool(true)
59+
bool(true)

‎ext/openssl/tests/openssl_x509_check_private_key_basic.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var_dump(openssl_x509_check_private_key($cert, $key));
1919
var_dump(openssl_x509_check_private_key("", $key));
2020
var_dump(openssl_x509_check_private_key($cert, ""));
2121
var_dump(openssl_x509_check_private_key("", ""));
22-
var_dump(openssl_x509_check_private_key($a, $b));
22+
var_dump(openssl_x509_check_private_key(openssl_x509_read($a), $b));
2323
?>
2424
--EXPECT--
2525
bool(true)

‎ext/openssl/tests/openssl_x509_checkpurpose.phpt renamed to ‎ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ $bert = "file://" . dirname(__FILE__) . "/bug41033.pem";
1313
$sert = "file://" . dirname(__FILE__) . "/san-cert.pem";
1414
$cpca = dirname(__FILE__) . "/san-ca.pem";
1515
$utfl = dirname(__FILE__) . "/sni_server_domain1.pem";
16+
$rcrt = openssl_x509_read($cert);
1617

1718
/* int openssl_x509_checkpurpose ( mixed $x509cert , int $purpose); */
1819
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SSL_CLIENT));
@@ -44,7 +45,7 @@ var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_NS_SSL_SERVER, array($cpc
4445
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_SIGN, array($cpca)));
4546
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_SMIME_ENCRYPT, array($cpca)));
4647
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_CRL_SIGN, array($cpca)));
47-
var_dump(openssl_x509_checkpurpose($cert, X509_PURPOSE_ANY, array($cpca)));
48+
var_dump(openssl_x509_checkpurpose($rcrt, X509_PURPOSE_ANY, array($cpca)));
4849
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_CLIENT, array($cpca)));
4950
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_SSL_SERVER, array($cpca)));
5051
var_dump(openssl_x509_checkpurpose($bert, X509_PURPOSE_NS_SSL_SERVER, array($cpca)));

0 commit comments

Comments
 (0)