php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
119,588 Commits 549 Branches 1,485 Tags
a167e0426d7c10e242ddcf7bcd034a1ddf37cdf3
Commit Graph

606 Commits

Author SHA1 Message Date
Fabien Villepinte 0c6d06ecfa Replace EXPECTF when possible 
Closes GH-5779
 2020-06-29 21:31:44 +02:00
Nikita Popov cd7d96610c Merge branch 'PHP-7.4' 2020-06-19 09:44:56 +02:00
Nikita Popov 21a2da2349 Generate temporary config file when generating certificates 
The putenv trick doesn't work on ZTS Windows, so generate a new
openssl config every time.
 2020-06-19 09:43:56 +02:00
Nikita Popov b5f5da4211 Merge branch 'PHP-7.4' 2020-06-18 15:56:14 +02:00
Nikita Popov 8ba0624a09 Downgrade server security level in security level test 
We want to test the client side error here, so make sure the
server side can start up successfully.
 2020-06-18 15:54:02 +02:00
Nikita Popov 472352f5a7 Merge branch 'PHP-7.4' 2020-06-18 15:49:43 +02:00
Nikita Popov c7fe71c8b7 Add SubjectAltName support to certificate generator 
And switch tests using SAN certificates to the generator.

This is ugly, but there doesn't seem to be a more direct way
to privide SAN in PHP.
 2020-06-18 15:49:08 +02:00
Nikita Popov c2a6395dcb Downgrade security level in tests using TLS < 1.2 
A few additional tests have been added on master that require
lower security level.
 2020-06-18 15:08:24 +02:00
Nikita Popov f3ff070034 Merge branch 'PHP-7.4' 2020-06-18 15:02:02 +02:00
Nikita Popov 72b3987c2d Generate certificates for bug69215.phpt 2020-06-18 14:58:48 +02:00
Nikita Popov 58ca47aff6 Generate certificate for bug68920.phpt 
The certificate really doesn't matter here, but it still needs to
comply with security level...
 2020-06-18 14:49:15 +02:00
Nikita Popov dd7d161ccf Generate certificate for bug65729.pem 
Make this test pass under security level 2.
 2020-06-18 14:43:57 +02:00
Nikita Popov 4f0ae4ad6e Merge branch 'PHP-7.4' 2020-06-18 14:22:29 +02:00
Nikita Popov 2c0d47c4b4 Revert "Fix tests regarding OpenSSL security_level" 
This reverts commit b281493503.
 2020-06-18 14:22:20 +02:00
Christoph M. Becker 5989b09d18 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix tests regarding OpenSSL security_level
 2020-06-18 13:29:33 +02:00
Christoph M. Becker b281493503 Fix tests regarding OpenSSL security_level 
The `security_level` stream option is only available as of OpenSSL
1.1.0, so we only set it for these versions.  Older OpenSSL versions
do not have security levels at all.
 2020-06-18 13:28:09 +02:00
Nikita Popov 20664d6023 Merge branch 'PHP-7.4' 2020-06-18 10:49:56 +02:00
Nikita Popov 6b702eea15 Migrate some tests to certificate generator 
This migrates all the tests using ext/openssl/tests/streams_crypto_method.pem
to the certificate generator, so we can easily adjust needed parameters.
In particular, this makes the cert security level 2 compatible.

However, we still need to downgrade security_level to 1 in a number
of tests, because they are testing TLS < 1.2 connections.
 2020-06-18 10:49:36 +02:00
Nikita Popov 9b70a831a2 Merge branch 'PHP-7.4' 2020-06-17 22:16:11 +02:00
Nikita Popov 52c2f1126d Use sha256 as digest algorithm in certificate generator 
This makes the generated certificates compatible with security
level 2, which is apparently the default on Ubuntu 20.04.

Unfortunately this does not fix all tests, because some are using
pre-generated certificates.
 2020-06-17 22:15:00 +02:00
Christoph M. Becker 4b76a2ddb3 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #62890: default_socket_timeout=-1 causes connection to timeout
 2020-06-09 16:48:41 +02:00
Christoph M. Becker 85657b486f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #62890: default_socket_timeout=-1 causes connection to timeout
 2020-06-09 16:47:00 +02:00
Christoph M. Becker eadd980706 Fix #62890: default_socket_timeout=-1 causes connection to timeout 
While unencrypted connections ignore negative timeouts, SSL/TLS
connections did not special case that, and so always failed due to
timeout.
 2020-06-09 16:45:34 +02:00
Eliot Lear 8583b8a9bf Add support for Cryptographic Message Syntax (CMS) 
It add CMS (RFC 5652) support, which is an update to PKCS7.  The functions
are analogous BUT NOT IDENTICAL to openssl_pkcs7*.  In particular, support for
different encodings (PEM, DER, SMIME) is now available.
 2020-06-07 16:58:34 +01:00
Nicolas Frandeboeuf 170d63ec62 openssl: Fix openssl_pkcs12_export_to_file extracerts test 
Same as https://github.com/php/php-src/pull/2681/files but for openssl_pkcs12_export_to_file

Closes GH-5665
 2020-06-05 22:28:01 +02:00
Christoph M. Becker 0b04b9347f Enclose contents of CLEAN sections in PHP tags 
We also place the CLEAN sections before EXPECT(F), and remove
extraneous clean-ups.
 2020-04-29 09:07:53 +02:00
Christoph M. Becker 919adcf161 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Enable error diagnostic for check_default_conf_path.phpt
 2020-04-01 19:21:46 +02:00
Christoph M. Becker 71e1d37938 Enable error diagnostic for check_default_conf_path.phpt 
Otherwise we have no clue why the test failed, if the regex didn't
match.
 2020-04-01 19:20:35 +02:00
Máté Kocsis 01b266aac4 Improve error messages of various extensions 
Closes GH-5278
 2020-03-23 18:59:04 +01:00
Máté Kocsis 960318ed95 Change argument error message format 
Closes GH-5211
 2020-02-26 15:00:08 +01:00
George Peter Banyard 1fdc53bc96 Remove deprecated capture_session_meta OpenSSL stream context 
Closes GH-5200
 2020-02-26 03:09:13 +01:00
Máté Kocsis ac0853eb26 Make type error messages more consistent 
Closes GH-5092
 2020-02-17 14:22:17 +01:00
Nikita Popov f8d795820e Reindent phpt files 2020-02-03 22:52:20 +01:00
Christoph M. Becker 7cb1a706bb Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79145: openssl memory leak
 2020-01-21 16:21:39 +01:00
Christoph M. Becker 16a8a608d5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79145: openssl memory leak
 2020-01-21 16:20:04 +01:00
Christoph M. Becker 9eff906a02 Fix #79145: openssl memory leak 
We must increase the refcount of `return_value` only if `cert` is a
resource; this is already done in `php_openssl_evp_from_zval()`,
though.
 2020-01-21 16:17:25 +01:00
Máté Kocsis 99db00b1f2 Fix #78880 Another round 2020-01-19 18:28:43 +01:00
Máté Kocsis d1764ca330 Make error messages more consistent by fixing capitalization 
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
 2020-01-17 14:52:46 +01:00
Máté Kocsis afdaa91170 Fix #78880: Final spelling fixes 2020-01-16 19:14:31 +01:00
Fabien Villepinte a555cc0b3d Clean DONE tags from tests 
Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.

Closes GH-4872.
 2019-11-07 21:31:47 +01:00
Christoph M. Becker e2338208aa Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update regarding changed OpenSSL default config path
 2019-10-01 09:16:51 +02:00
Christoph M. Becker 59ac81f81e Update regarding changed OpenSSL default config path 2019-10-01 09:14:58 +02:00
Christoph M. Becker 789e8e174a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add missing SKIPIF (openssl)
 2019-09-04 08:43:51 +02:00
Fabien Villepinte 7aece45f4d Add missing SKIPIF (openssl) 
Co-Authored-By: Gabriel Caruso <carusogabriel34@gmail.com>
 2019-09-04 08:43:32 +02:00
Nikita Popov 699b465da2 Fixed bug #78391 2019-08-09 15:03:40 +02:00
Nikita Popov 4276d669d2 Merge branch 'PHP-7.4' 2019-08-09 15:02:57 +02:00
Nikita Popov 69a771346a Fixed bug #78391 2019-08-09 15:02:44 +02:00
Nikita Popov 7686b0b889 Merge branch 'PHP-7.4' 2019-06-05 14:53:50 +02:00
Nikita Popov a31f46421d Allow exceptions in __toString() 
RFC: https://wiki.php.net/rfc/tostring_exceptions

And convert some object to string conversion related recoverable
fatal errors into Error exceptions.

Improve exception safety of internal code performing string
conversions.
 2019-06-05 14:25:07 +02:00
Nikita Popov 7013e8be85 Merge branch 'PHP-7.4' 2019-06-03 18:59:21 +02:00