summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Improve parameter names in ext/hash and ext/opensslMáté Kocsis2020-09-242-26/+26
| | | | | | | | | | | | | | | | Closes GH-6156
* | | | Run tidyNikita Popov2020-09-186-9/+9
| | | | | | | | | | | | | | | | | | | | This should fix most of the remaining issues with tabs and spaces being mixed in tests.
* | | | missing fix for test for new param. nameRemi Collet2020-09-161-1/+1
| | | |
* | | | Adjust ext/openssl parameter namesMáté Kocsis2020-09-153-44/+54
| | | | | | | | | | | | | | | | Closes GH-6121
* | | | Fix broken testMatteo Beccati2020-09-131-1/+1
| | | | | | | | | | | | | | | | Since e8e4ddce
* | | | Improve parameter handling in ext/opensslMáté Kocsis2020-09-1216-308/+301
| | | | | | | | | | | | | | | | Closes GH-6025
* | | | Consolidate new union type ZPP macro namesMáté Kocsis2020-09-111-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They will now follow the canonical order of types. Older macros are left intact due to maintaining BC. Closes GH-6112
* | | | Improve error messages mentioning parameters instead of argumentsMáté Kocsis2020-09-091-1/+1
| | | | | | | | | | | | | | | | Closes GH-5999
* | | | Require $method parameter in openssl_seal/openssl_openNikita Popov2020-09-088-72/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RC4 is considered insecure, and it's not possible to change the default of these functions. As such, require the method to be passed explicitly. Closes GH-6093.
* | | | Promote various OpenSSL warnings into ErrorsGeorge Peter Banyard2020-08-1610-142/+169
| | | | | | | | | | | | | | | | Closes GH-5111
* | | | Fix types in openssl stubNikita Popov2020-08-142-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | These two $recipcert parameters don't use proper union types right now. They are a bit tricky due to the $recipkey -> $recipcert fallback.
* | | | Remove some unnnecessary null checks in opensslNikita Popov2020-08-101-69/+22
| | | | | | | | | | | | | | | | | | | | | | | | Remove null checks before EVP_PKEY_free and BIO_free. NULL is a no-op for both of these. Probably applies to most other freeing function as well...
* | | | Improve X509_PKEY management in OpenSSLNikita Popov2020-08-101-129/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the free_pkey argument from php_openssl_pkey_from_zval, instead return an EVP_PKEY that always needs to be freed (by incrementing refcount if necessary). This makes the code simpler and fixes a number of bugs in the existing handling. Closes GH-5946.
* | | | Add many missing closing PHP tags to testsMáté Kocsis2020-08-091-0/+1
| | | | | | | | | | | | | | | | Closes GH-5958
* | | | Add a few missing types to stubsMáté Kocsis2020-08-012-4/+9
| | | |
* | | | Convert resources to objects in ext/opensslMáté Kocsis2020-08-0135-769/+1071
| | | | | | | | | | | | | | | | | | | | | | | | Closes GH-5860 Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-07-222-4/+49
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fixed bug #79881
| * | | Fixed bug #79881Nikita Popov2020-07-222-4/+49
| | | |
* | | | Remove proto comments from C filesMax Semenik2020-07-061-129/+65
| | | | | | | | | | | | | | | | Closes GH-5758
* | | | Avoid some unnecessary uses of no_separation=0Nikita Popov2020-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | For the rare cases where references are part of the API, construct them explicitly. Otherwise do not allow separation.
* | | | Replace EXPECTF when possibleFabien Villepinte2020-06-299-9/+9
| | | | | | | | | | | | | | | | Closes GH-5779
* | | | Include stub hash in generated arginfo filesNikita Popov2020-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hash is used to check whether the arginfo file needs to be regenerated. PHP-Parser will only be downloaded if this is actually necessary. This ensures that release artifacts will never try to regenerate stubs and thus fetch PHP-Parser, as long as you do not modify any files. Closes GH-5739.
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-06-192-37/+47
|\ \ \ \ | |/ / /
| * | | Generate temporary config file when generating certificatesNikita Popov2020-06-192-37/+47
| | | | | | | | | | | | | | | | | | | | The putenv trick doesn't work on ZTS Windows, so generate a new openssl config every time.
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-06-181-1/+4
|\ \ \ \ | |/ / /
| * | | Downgrade server security level in security level testNikita Popov2020-06-181-1/+4
| | | | | | | | | | | | | | | | | | | | We want to test the client side error here, so make sure the server side can start up successfully.
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-06-187-77/+71
|\ \ \ \ | |/ / /
| * | | Add SubjectAltName support to certificate generatorNikita Popov2020-06-187-77/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Downgrade security level in tests using TLS < 1.2Nikita Popov2020-06-185-5/+15
| | | | | | | | | | | | | | | | | | | | A few additional tests have been added on master that require lower security level.
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-06-187-122/+52
|\ \ \ \ | |/ / /
| * | | Generate certificates for bug69215.phptNikita Popov2020-06-184-86/+22
| | | |
| * | | Generate certificate for bug68920.phptNikita Popov2020-06-181-1/+12
| | | | | | | | | | | | | | | | | | | | The certificate really doesn't matter here, but it still needs to comply with security level...
| * | | Generate certificate for bug65729.pemNikita Popov2020-06-182-35/+18
| | | | | | | | | | | | | | | | Make this test pass under security level 2.
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-06-184-41/+19
|\ \ \ \ | |/ / /
| * | | Revert "Fix tests regarding OpenSSL security_level"Nikita Popov2020-06-183-36/+18
| | | | | | | | | | | | | | | | This reverts commit b281493503401a2b5c45c11fcd0498d8448998c2.
| * | | Don't generate spurious warning is security_level not supportedNikita Popov2020-06-181-5/+1
| | | | | | | | | | | | | | | | | | | | People should not have to worry about the used openssl version when downgrading security_level.
* | | | Merge branch 'PHP-7.4'Christoph M. Becker2020-06-183-18/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix tests regarding OpenSSL security_level
| * | | Fix tests regarding OpenSSL security_levelChristoph M. Becker2020-06-183-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-06-189-41/+106
|\ \ \ \ | |/ / /
| * | | Migrate some tests to certificate generatorNikita Popov2020-06-189-41/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'PHP-7.4'Nikita Popov2020-06-171-1/+2
|\ \ \ \ | |/ / /
| * | | Use sha256 as digest algorithm in certificate generatorNikita Popov2020-06-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'PHP-7.4'Christoph M. Becker2020-06-092-2/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix #62890: default_socket_timeout=-1 causes connection to timeout
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-092-2/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.3: Fix #62890: default_socket_timeout=-1 causes connection to timeout
| | * | Fix #62890: default_socket_timeout=-1 causes connection to timeoutChristoph M. Becker2020-06-092-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | While unencrypted connections ignore negative timeouts, SSL/TLS connections did not special case that, and so always failed due to timeout.
* | | | Constify char * arguments of APIstwosee2020-06-082-24/+46
| | | | | | | | | | | | | | | | Closes GH-5676.
* | | | Fix leak in openssl_cms_read()Nikita Popov2020-06-081-0/+6
| | | |
* | | | Add support for Cryptographic Message Syntax (CMS)Eliot Lear2020-06-0720-6/+1746
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | openssl: Fix openssl_pkcs12_export_to_file extracerts testNicolas Frandeboeuf2020-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Same as https://github.com/php/php-src/pull/2681/files but for openssl_pkcs12_export_to_file Closes GH-5665
* | | | Fix [-Wundef] warning in OpenSSL extensionGeorge Peter Banyard2020-05-201-1/+1
| | | |