summaryrefslogtreecommitdiff
path: root/ext/openssl/openssl.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-02-231-3/+5
|\
| * Fix some arginfosGabriel Caruso2018-02-231-3/+5
* | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-02-201-3/+2
|\ \ | |/
| * Fix openssl_* arginfosGabriel Caruso2018-02-201-3/+2
| * year++Xinchen Hui2018-01-021-1/+1
* | year++Xinchen Hui2018-01-021-1/+1
* | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2017-10-301-3/+6
|\ \ | |/
| * Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-10-301-3/+6
| |\
| | * Prevent leaking x509 and csr resources if it is not requestedJakub Zelenka2017-10-301-3/+6
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-10-271-4/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-10-271-4/+5
| |\ \ | | |/
| | * Fix bug #75307 Wrong reflection for openssl_open functionFabien Villepinte2017-10-271-4/+5
* | | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2017-10-151-25/+27
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-10-151-25/+27
| |\ \ | | |/
| | * Properly fix #75363 and address some other leaks with certJakub Zelenka2017-10-151-25/+27
* | | Merge branch 'PHP-7.1' into PHP-7.2Bob Weinand2017-10-121-9/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2017-10-121-9/+1
| |\ \ | | |/
| | * Fixed bug #75363 (openssl_x509_parse leaks memory)Bob Weinand2017-10-121-9/+1
| * | Followup on 0ec147d3 for another placeAnatol Belski2017-07-241-8/+0
| * | Ensure binary mode for OpenSSL I/OAnatol Belski2017-07-241-14/+14
* | | 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
* | | Followup on 0ec147d3 for another placeAnatol Belski2017-07-241-8/+0
* | | Ensure binary mode for OpenSSL I/OAnatol Belski2017-07-241-15/+15
* | | Make functions in openssl.c more consistentJakub Zelenka2017-07-161-61/+78
* | | Merge branch 'PHP-7.1'Stanislav Malyshev2017-07-041-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-07-041-1/+1
| |\ \ | | |/
| | * Fix bug #74651 - check EVP_SealInit as it can return -1Stanislav Malyshev2017-07-041-1/+1
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-06-251-16/+23
|\ \ \ | |/ /
| * | Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key paddingJakub Zelenka2017-06-251-16/+23
* | | Merge branch 'PHP-7.1'Anatol Belski2017-06-241-2/+2
|\ \ \ | |/ /
| * | Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in contentAnatol Belski2017-06-241-2/+2
* | | Add openssl_pkcs7_read and output P7B in openssl_pkcs7_verifyJelle van der Waa2017-06-221-4/+134
* | | 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
* | | 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-091-2/+2
|\ \ \ | |/ /
| * | Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used inAnatol Belski2017-06-091-2/+2
* | | 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
* | | Merge branch 'PHP-7.1'Anatol Belski2017-05-181-2/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-05-181-2/+4
| |\ \ | | |/
| | * follow up fix on bug #74022Anatol Belski2017-05-181-2/+4
| | * Fix possible memory leak in openssl_encrypt and openssl_decryptJakub Zelenka2017-04-271-2/+2
| | * Do not add already added object to the internal OpenSSL tableJakub Zelenka2017-04-261-1/+2