summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-04-305-7/+5
|\ \ \ | |/ /
| * | Fix bug #73808 (iv length warning too restrictive for aes-128-ccm)Jakub Zelenka2017-04-305-7/+5
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-04-274-3/+10
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-04-274-3/+10
| |\ \ | | |/
| | * Prefer using DIRECTORY_SEPARATOR in OpenSSL config pathJakub Zelenka2017-04-273-3/+3
| | * Add oid_section to the testing openssl.cnfJakub Zelenka2017-04-271-0/+7
| | * Do not add already added object to the internal OpenSSL tableJakub Zelenka2017-04-261-1/+2
* | | Merge branch 'PHP-7.1'Remi Collet2017-04-261-2/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-04-261-2/+3
| |\ \ | | |/
| | * rely on bundle config, instead of system oneRemi Collet2017-04-261-2/+3
| * | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-04-261-0/+1
| |\ \ | | |/
| | * skip the test on OpenSSL < 1.1 for nowAnatol Belski2017-04-261-0/+1
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-04-242-25/+90
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-04-242-25/+90
| |\ \ | | |/
| | * Fix bug #73833 (null character not allowed in openssl_pkey_get_private)Jakub Zelenka2017-04-242-25/+90
* | | Merge branch 'PHP-7.1'Anatol Belski2017-04-241-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-04-241-1/+1
| |\ \ | | |/
| | * Support also no,shared configure arg vals by defaultAnatol Belski2017-04-241-1/+1
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-04-233-14/+24
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-04-233-14/+24
| |\ \ | | |/
| | * Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key)Jakub Zelenka2017-04-233-14/+24
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-04-102-1/+30
|\ \ \ | |/ /