clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source
This commit is contained in:
Jakub Zelenka 2021-09-12 20:31:21 +01:00
commit 560a6166a1
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/openssl/tests/bug52093.phpt
View File

@ -15,10 +15,10 @@ $dn = array(
"commonName" => "Henrique do N. Angelo", "commonName" => "Henrique do N. Angelo",
"emailAddress" => "hnangelo@php.net" "emailAddress" => "hnangelo@php.net"
); );
$options = ['config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'];
$privkey = openssl_pkey_new(); $privkey = openssl_pkey_new();
$csr = openssl_csr_new($dn, $privkey); $csr = openssl_csr_new($dn, $privkey, $options);
$cert = openssl_csr_sign($csr, null, $privkey, 365, [], PHP_INT_MAX); $cert = openssl_csr_sign($csr, null, $privkey, 365, $options, PHP_INT_MAX);
var_dump(openssl_x509_parse($cert)['serialNumber']); var_dump(openssl_x509_parse($cert)['serialNumber']);
?> ?>
--EXPECT-- --EXPECT--

5
ext/openssl/tests/bug72165.phpt
View File

@ -4,8 +4,9 @@ Bug #72165 Null pointer dereference - openssl_csr_new
openssl openssl
--FILE-- --FILE--
<?php <?php
$var0 = array(0 => "hello", 1 => "world"); $var0 = [0 => "hello", 1 => "world"];
$var2 = openssl_csr_new(array(0),$var0,null,array(0)); $options = ['config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'];
$var2 = openssl_csr_new([0], $var0, $options, [0]);
?> ?>
--EXPECTF-- --EXPECTF--
Warning: openssl_csr_new(): dn: numeric fild names are not supported in %sbug72165.php on line %d Warning: openssl_csr_new(): dn: numeric fild names are not supported in %sbug72165.php on line %d

3
ext/openssl/tests/bug73711.phpt
View File

@ -4,13 +4,16 @@ Bug #73711: Segfault in openssl_pkey_new when generating DSA or DH key
openssl openssl
--FILE-- --FILE--
<?php <?php
$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
var_dump(openssl_pkey_new([ var_dump(openssl_pkey_new([
"private_key_type" => OPENSSL_KEYTYPE_DSA, "private_key_type" => OPENSSL_KEYTYPE_DSA,
"private_key_bits" => 1024, "private_key_bits" => 1024,
'config' => $config,
])); ]));
var_dump(openssl_pkey_new([ var_dump(openssl_pkey_new([
"private_key_type" => OPENSSL_KEYTYPE_DH, "private_key_type" => OPENSSL_KEYTYPE_DH,
"private_key_bits" => 512, "private_key_bits" => 512,
'config' => $config,
])); ]));
echo "DONE"; echo "DONE";
?> ?>

3
ext/openssl/tests/ecc.phpt
View File

@ -6,9 +6,11 @@ openssl
<?php if (!defined("OPENSSL_KEYTYPE_EC")) print "skip"; ?> <?php if (!defined("OPENSSL_KEYTYPE_EC")) print "skip"; ?>
--FILE-- --FILE--
<?php <?php
$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';
$args = array( $args = array(
"curve_name" => "secp384r1", "curve_name" => "secp384r1",
"private_key_type" => OPENSSL_KEYTYPE_EC, "private_key_type" => OPENSSL_KEYTYPE_EC,
"config" => $config,
); );
echo "Testing openssl_pkey_new\n"; echo "Testing openssl_pkey_new\n";
$key1 = openssl_pkey_new($args); $key1 = openssl_pkey_new($args);
@ -17,6 +19,7 @@ var_dump($key1);
$argsFailed = array( $argsFailed = array(
"curve_name" => "invalid_cuve_name", "curve_name" => "invalid_cuve_name",
"private_key_type" => OPENSSL_KEYTYPE_EC, "private_key_type" => OPENSSL_KEYTYPE_EC,
"config" => $config,
); );
$keyFailed = openssl_pkey_new($argsFailed); $keyFailed = openssl_pkey_new($argsFailed);

9
ext/openssl/tests/openssl_error_string_basic_openssl3.phpt
View File

@ -100,18 +100,19 @@ echo "\n";
$err_pem_no_start_line = '0480006C'; $err_pem_no_start_line = '0480006C';
// PKEY // PKEY
$options = ['config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'];
echo "PKEY errors\n"; echo "PKEY errors\n";
// file for pkey (file:///) fails when opennig (BIO_new_file) // file for pkey (file:///) fails when opennig (BIO_new_file)
@openssl_pkey_export_to_file("file://" . $invalid_file_for_read, $output_file); @openssl_pkey_export_to_file("file://" . $invalid_file_for_read, $output_file, null, $options);
expect_openssl_errors('openssl_pkey_export_to_file opening', ['10000080']); expect_openssl_errors('openssl_pkey_export_to_file opening', ['10000080']);
// file or private pkey is not correct PEM - failing PEM_read_bio_PrivateKey // file or private pkey is not correct PEM - failing PEM_read_bio_PrivateKey
@openssl_pkey_export_to_file($csr_file, $output_file); @openssl_pkey_export_to_file($csr_file, $output_file, null, $options);
expect_openssl_errors('openssl_pkey_export_to_file pem', ['1E08010C']); expect_openssl_errors('openssl_pkey_export_to_file pem', ['1E08010C']);
// file to export cannot be written // file to export cannot be written
@openssl_pkey_export_to_file($private_key_file, $invalid_file_for_write); @openssl_pkey_export_to_file($private_key_file, $invalid_file_for_write, null, $options);
expect_openssl_errors('openssl_pkey_export_to_file write', ['10080002']); expect_openssl_errors('openssl_pkey_export_to_file write', ['10080002']);
// successful export // successful export
@openssl_pkey_export($private_key_file_with_pass, $out, 'wrong pwd'); @openssl_pkey_export($private_key_file_with_pass, $out, 'wrong pwd', $options);
expect_openssl_errors('openssl_pkey_export', ['1C800064', '04800065']); expect_openssl_errors('openssl_pkey_export', ['1C800064', '04800065']);
// invalid x509 for getting public key // invalid x509 for getting public key
@openssl_pkey_get_public($private_key_file); @openssl_pkey_get_public($private_key_file);