summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.2'Jakub Zelenka2017-08-301-0/+8
|\
| * Automatically load OpenSSL configuration fileJakub Zelenka2017-08-301-0/+4
| * Do not explicitly initialize and clean up OpenSSL for OpenSSL 1.1Jakub Zelenka2017-08-301-0/+4
* | openssl: add basic openssl_get_cert_locations testJelle van der Waa2017-08-191-0/+28
* | Refactor php_url struct to save memory dup in common casesXinchen Hui2017-08-061-2/+2
|/
* Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-07-241-0/+83
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-07-241-0/+83
| |\
| | * Add test for bug #74903Anatol Belski2017-07-241-0/+83
| * | Followup on 0ec147d3 for another placeAnatol Belski2017-07-243-9/+10
| * | Ensure binary mode for OpenSSL I/OAnatol Belski2017-07-241-14/+14
* | | Followup on 0ec147d3 for another placeAnatol Belski2017-07-243-9/+10
* | | Ensure binary mode for OpenSSL I/OAnatol Belski2017-07-241-15/+15
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-07-241-0/+60
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-241-0/+60
| |\ \ | | |/
| | * openssl: Add openssl_pkcs12_export_to_file testsJelle van der Waa2017-07-241-0/+60
* | | Add support for OpenSSL security levelJakub Zelenka2017-07-172-0/+65
* | | Make functions in openssl.c more consistentJakub Zelenka2017-07-161-61/+78
* | | Make consitent naming and improve CS in xp_sslJakub Zelenka2017-07-161-134/+155
* | | Allow setting SNI cert and pk in separate filesJakub Zelenka2017-07-168-19/+386
* | | Merge branch 'PHP-7.1'Stanislav Malyshev2017-07-043-1/+45
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-07-043-1/+45
| |\ \ | | |/
| | * Fix bug #74651 - check EVP_SealInit as it can return -1Stanislav Malyshev2017-07-043-1/+45
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-06-256-16/+74
|\ \ \ | |/ /
| * | Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key paddingJakub Zelenka2017-06-256-16/+74
* | | Relax test condition, as OpenSSL 1.1.x out differs in EOL onlyAnatol Belski2017-06-241-1/+1
* | | Merge branch 'PHP-7.1'Anatol Belski2017-06-242-2/+98
|\ \ \ | |/ /
| * | Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in contentAnatol Belski2017-06-242-2/+98
* | | Add openssl_pkcs7_read and output P7B in openssl_pkcs7_verifyJelle van der Waa2017-06-225-4/+255
* | | Default single_dh_use and honor_cipher_order to trueNiklas Keller2017-06-181-2/+2
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-06-184-0/+203
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-06-184-0/+203
| |\ \ | | |/
| | * openssl: Add openssl_pkcs12_(read, export) testsJelle van der Waa2017-06-184-0/+203
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-06-161-4/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-06-161-4/+2
| |\ \ | | |/
| | * openssl: Fix spkstr and spki leak in openssl_spki_newJelle van der Waa2017-06-161-4/+2
* | | Use any TLS crypto method by default, don't use SSLNiklas Keller2017-06-102-2/+61
* | | Merge branch 'PHP-7.1'Anatol Belski2017-06-091-3/+11
|\ \ \ | |/ /
| * | group the change for bug #74720Anatol Belski2017-06-091-3/+11
* | | Merge branch 'PHP-7.1'Anatol Belski2017-06-093-2/+183
|\ \ \ | |/ /
| * | Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used inAnatol Belski2017-06-093-2/+183
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-06-041-17/+24
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-06-041-17/+24
| |\ \ | | |/
| | * Replace ASN1_STRING_data with ASN1_STRING_get0_dataJakub Zelenka2017-06-041-17/+24
* | | Merge branch 'PHP-7.1'Nikita Popov2017-06-021-0/+1
|\ \ \ | |/ /
| * | openssl_pkcs12_read: add missing BIO_freeJelle van der Waa2017-06-021-0/+1
* | | openssl: Add basic openssl_pkcs7_verify testsJelle van der Waa2017-06-012-0/+116
* | | Merge branch 'PHP-7.1'Anatol Belski2017-05-182-2/+28
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-05-182-2/+28
| |\ \ | | |/
| | * follow up fix on bug #74022Anatol Belski2017-05-182-2/+28
| | * Fix possible memory leak in openssl_encrypt and openssl_decryptJakub Zelenka2017-04-271-2/+2