summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-11-051-0/+2
|\ | | | | | | | | * PHP-7.3: Fixed bug #78775
| * Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-11-051-0/+2
| |\ | | | | | | | | | | | | * PHP-7.2: Fixed bug #78775
| | * Fixed bug #78775Nikita Popov2019-11-051-0/+2
| | | | | | | | | | | | | | | | | | Clear the OpenSSL error queue before performing SSL stream operations. As we don't control all code that could possibly be using OpenSSL, we can't rely on the error queue being empty.
* | | Update regarding changed OpenSSL default config pathChristoph M. Becker2019-10-011-3/+3
| | |
* | | Add missing SKIPIF (openssl)Fabien Villepinte2019-09-041-0/+2
| | | | | | | | | | | | Co-Authored-By: Gabriel Caruso <carusogabriel34@gmail.com>
* | | Fixed bug #78391Nikita Popov2019-08-092-1/+14
| | |
* | | Remove php_openssl_cipher_get_version()Nikita Popov2019-07-241-21/+2
| | | | | | | | | | | | | | | | | | This was added in 7.1 when add_assoc_string mistakenly accepted a char* rather than const char* parameter and is no longer needed. We can use SSL_CIPHER_get_version() directly.
* | | Report errors from stream read and write operationsNikita Popov2019-07-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The php_stream_read() and php_stream_write() functions now return an ssize_t value, with negative results indicating failure. Functions like fread() and fwrite() will return false in that case. As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams should not be regarded as error conditions, and be reported as successful zero-length reads/writes instead. The handling of EINTR remains unclear and is internally inconsistent (e.g. some code-paths will automatically retry on EINTR, while some won't). I'm landing this now to make sure the stream wrapper ops API changes make it into 7.4 -- however, if the user-facing changes turn out to be problematic we have the option of clamping negative returns to zero in php_stream_read() and php_stream_write() to restore the old behavior in a relatively non-intrusive manner.
* | | Remove HAVE_DSA_DEFAULT_METHODPeter Kokot2019-07-221-10/+0
| | | | | | | | | | | | | | | | | | Last usage removed via 6a813634052710f3f4bf6e2e03ca1b6c7be3bcee. Closes GH-4455
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-07-031-1/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-07-031-1/+2
| |\ \ | | |/
| | * Fixed bug #78231Nikita Popov2019-07-031-1/+2
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-212-13/+34
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-06-212-13/+34
| |\ \ | | |/
| | * Fix PKCS12 leak in opensslNikita Popov2019-06-211-2/+3
| | |
| | * Fix d leak in ecc openssl_pkey_newNikita Popov2019-06-211-1/+6
| | |
| | * Fix netscape spki leak in opensslNikita Popov2019-06-211-0/+3
| | |
| | * Fix X509 leak in openssl_pkcs7_verify()Nikita Popov2019-06-211-1/+1
| | |
| | * Fix CSR leaks in opensslNikita Popov2019-06-211-9/+20
| | |
| | * Free cert in php_openssl_load_stream_cafile()Nikita Popov2019-06-211-0/+1
| | | | | | | | | | | | | | | X509_STORE_add_cert() increments the refcount of the cert, so we should free it here.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-211-0/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-06-211-0/+6
| |\ \ | | |/
| | * Fix memory leak in TLS matches_san_listNiklas Keller2019-06-211-0/+6
| | |
* | | Fix compilation without deprecated OpenSSL 1.1 APIsRosen Penev2019-06-142-11/+29
| | |
* | | Cheaper checks for exceptions thrown from __toString()Dmitry Stogov2019-06-062-14/+14
| | |
* | | Allow exceptions in __toString()Nikita Popov2019-06-054-45/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Prevent use of TLS 1.3 in stream_server_reneg_limit.phptNikita Popov2019-06-031-0/+2
| | | | | | | | | | | | | | | TLS 1.3 does not support renegotiation, make sure this test does not use it.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-031-0/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-06-031-0/+1
| |\ \ | | |/
| | * Clear errors after SSL_CTX_load_verify_locations()Nikita Popov2019-06-031-0/+1
| | | | | | | | | | | | | | | We report our own errors here. Make sure these don't clog up the error queue.
* | | Merge branch 'PHP-7.3' into PHP-7.4Jakub Zelenka2019-06-022-4/+13
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-06-022-4/+13
| |\ \ | | |/
| | * Fix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c)Jakub Zelenka2019-06-022-4/+13
| | | | | | | | | | | | It also fixes invalid setting of tag length
* | | Remove confusing spkstr checksNikita Popov2019-05-311-18/+3
| | | | | | | | | | | | This is a required parameter, it can never be NULL.
* | | Normalize comments in *nix build system m4 filesPeter Kokot2019-05-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Normalization include: - Use dnl for everything that can be ommitted when configure is built in favor of the shell comment character # which is visible in the output. - Line length normalized to 80 columns - Dots for most of the one line sentences - Macro definitions include similar pattern header comments now
* | | Remove unused variablePeter Kokot2019-05-101-2/+0
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Jakub Zelenka2019-05-051-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-05-051-1/+1
| |\ \ | | |/
| | * Fix OpenSSL online test for ca contextJakub Zelenka2019-05-051-1/+1
| | | | | | | | | | | | The php.net is redirected to https so use nginx.org
* | | Enable TLS 1.3 by defaultJakub Zelenka2019-04-282-0/+67
| | |
* | | Fix tests and logic for TLS 1.3Jakub Zelenka2019-04-283-28/+39
| | |
* | | Added tls 1.3 support for PHPcodarrenvelvindron2019-04-284-5/+142
| | |
* | | Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function ↵Dmitry Stogov2019-04-241-17/+17
| | | | | | | | | | | | by reference
* | | Remove PHP_SETUP_KERBEROS m4 macroPeter Kokot2019-04-201-1/+4
| | | | | | | | | | | | | | | | | | With recent transition to pkg-config/pkgconf this macro has been now a simple wrapper for PKG_CHECK_MODULES and PHP_EVAL_INCLINE so it's better to omit it altogether and use these two in the *.m4 code directly.
* | | Use PKG_CHECK_MODULES to detect the kerberos librariesHugh McMaster2019-04-201-1/+1
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-04-151-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-04-151-1/+1
| |\ \ | | |/
| | * Fix uninitialized cert_capturedNikita Popov2019-04-151-1/+1
| | | | | | | | | | | | This is a legimitimate bug and also shows up under valgrind.
* | | Remove extension readmesPeter Kokot2019-03-191-320/+0
| | | | | | | | | | | | | | | This patch removes several extension readmes in favor of the PHP manual and where possible.
* | | Replace dirname(__FILE__) by __DIR__ in testsFabien Villepinte2019-03-1546-95/+95
| | |