Jakub Zelenka
d95ee27551
Make new openssl ext tests in 7.2 consitent
2018-06-21 17:02:44 +01:00
Jakub Zelenka
77bd405959
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-21 16:47:08 +01:00
Jakub Zelenka
b20bcbc363
Use unix NL in all openssl ext tests
2018-06-21 16:43:32 +01:00
Jakub Zelenka
3c42f64e6e
Make code in openssl ext tests more consistent
...
Mainly use spaces for indent and fix some other CS issues. Also
drop checks for unsupported OpenSSL library versions.
2018-06-21 16:38:19 +01:00
Jakub Zelenka
a231860b02
Merge branch 'PHP-7.1' into PHP-7.2
2018-05-22 13:40:23 +01:00
Jakub Zelenka
68c3d09c2c
Fix bug #76174 (openssl extension fails to build with LibreSSL 2.7)
2018-05-22 13:30:58 +01:00
Jakub Zelenka
b027071688
Merge branch 'PHP-7.1' into PHP-7.2
2018-05-18 17:23:17 +01:00
Jakub Zelenka
798e707eb3
Add test for bug #76296
2018-05-18 17:15:36 +01:00
Erik Lax
d6bc266ba0
Fix bug #76296 (openssl_pkey_get_public does not respect open_basedir)
2018-05-18 17:15:22 +01:00
Jakub Zelenka
98e43a33c8
Merge branch 'PHP-7.1' into PHP-7.2
2018-04-15 20:42:28 +01:00
Jakub Zelenka
2ef8809ef3
Make openssl_error_string test work in OpenSSL 1.1.1
...
It was the only failing test
2018-04-15 20:41:23 +01:00
Christoph M. Becker
c6cf3d4ada
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix some arginfos
2018-02-23 11:29:21 +01:00
Gabriel Caruso
0b8cfa6c78
Fix some arginfos
...
* all arguments for ftp_pasv are required
* $varname for getenv function isn't required anymore
* fsockopen and pfsockopen only require $hostname
* strtok can work with only one parameter
* strpbrk needs two parameters to work
* required parameters and add some parameters in openssl_* functions
2018-02-23 11:27:14 +01:00
Christoph M. Becker
e80e38ab7c
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix openssl_* arginfos
2018-02-20 16:25:22 +01:00
Gabriel Caruso
276b57316c
Fix openssl_* arginfos
...
openssl_pkcs12_export and openssl_x509_parse had wrong arginfos
2018-02-20 16:23:42 +01:00
Jakub Zelenka
3348d40a7b
Use correct certs for SNI server tests with separate key and cert
2018-01-30 20:08:19 +00:00
Jakub Zelenka
aef59537e6
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-30 20:02:34 +00:00
Jakub Zelenka
fe2ac52d50
Use correct certs for SNI server tests
2018-01-30 19:58:40 +00:00
Xinchen Hui
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
Jakub Zelenka
19c62e83fa
Merge branch 'PHP-7.1' into PHP-7.2
2017-10-30 16:43:36 +00:00
Jakub Zelenka
7c2031bfca
Merge branch 'PHP-7.0' into PHP-7.1
2017-10-30 16:42:23 +00:00
Jakub Zelenka
fc169d2133
Prevent leaking x509 and csr resources if it is not requested
...
All functions using php_openssl_x509_from_zval or php_openssl_csr_from_zval
with makeresource equal to 0 do not deref the resource which means there
is a leak till the end of the request. This can cause issues for long
running apps. It is a generic solution for bug #75363 which also covers
other functions.
2017-10-30 16:40:56 +00:00
Jakub Zelenka
d8ccffa79a
Extend and speed up pkey export tests
2017-10-30 16:40:56 +00:00
Jakub Zelenka
e78e839e53
Rewrite openssl_csr_get_subject test to improve coverage
2017-10-30 16:40:56 +00:00
Jakub Zelenka
528aa540b4
Add openssl_csr_get_public_key test
2017-10-30 16:40:56 +00:00
Jakub Zelenka
548798818b
Extend openssl_pkcs7_* tests to cover resource cert
2017-10-30 16:40:56 +00:00
Jakub Zelenka
55d92413b9
Fix cleaning tmp output file in openssl_csr_export_to_file test
2017-10-30 16:40:56 +00:00
Jelle van der Waa
5812f7a8d3
openssl: add basic openssl_csr_export_to_file tests
...
Add a basic test for openssl_csr_export_to_file.
2017-10-30 16:40:56 +00:00
Jakub Zelenka
628a52d365
Extend openssl_csr_sign test to cover cert resource
2017-10-30 16:40:56 +00:00
Jakub Zelenka
80191eebec
Set different invalid path in openssl_pkcs12_export so it is more unlikely to exist
2017-10-30 16:40:55 +00:00
Jakub Zelenka
cd66aad141
Extend openssl_x509_parse to cover cert resource
2017-10-30 16:40:55 +00:00
Jakub Zelenka
c1d98588a2
Rename and test resource cert in openssl_x509_checkpurpose test
2017-10-30 16:40:55 +00:00
Jakub Zelenka
d23d4fd61b
Extend openssl_x509_check_private_key to test resource cert
2017-10-30 16:40:55 +00:00
Jakub Zelenka
be0758b75a
Extend openssl_x509_fingerprint test to cover resource cert with sha1
2017-10-30 16:40:55 +00:00
Joe Watkins
f2367d4626
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #75307 Wrong reflection for openssl_open function
2017-10-27 16:06:57 +01:00
Joe Watkins
14be7dcf8e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #75307 Wrong reflection for openssl_open function
2017-10-27 16:06:29 +01:00
Fabien Villepinte
51ea2cfbe1
Fix bug #75307 Wrong reflection for openssl_open function
2017-10-27 16:06:01 +01:00
Jakub Zelenka
e33721978e
Merge branch 'PHP-7.1' into PHP-7.2
2017-10-22 18:58:15 +01:00
Jakub Zelenka
f10fd89f99
Merge branch 'PHP-7.0' into PHP-7.1
2017-10-22 18:57:14 +01:00
Jakub Zelenka
34ed75fab7
Fix clean up for openssl_pkcs12_export_to_file_basic
2017-10-22 18:54:15 +01:00
Jelle van der Waa
314bef5d03
openssl: Fix openssl_pkcs12_export extracerts test
...
Fix the openssl_pkcs12_export testcase for extracerts, the 'extracerts'
option needs to be the key of the certificate value otherwise
openssl_pkcs12_export will ignore it.
2017-10-22 18:53:30 +01:00
Jakub Zelenka
a3da46b524
Merge branch 'PHP-7.1' into PHP-7.2
2017-10-15 20:33:22 +01:00
Jakub Zelenka
547fee9cd4
Merge branch 'PHP-7.0' into PHP-7.1
2017-10-15 20:31:25 +01:00
Jakub Zelenka
999fe36d40
Properly fix #75363 and address some other leaks with cert
2017-10-15 20:25:58 +01:00
Bob Weinand
ee36507423
Merge branch 'PHP-7.1' into PHP-7.2
2017-10-12 12:32:30 +02:00
Bob Weinand
f8ff4c4918
Merge branch 'PHP-7.0' into PHP-7.1
2017-10-12 12:31:20 +02:00
Bob Weinand
a55af1e271
Fixed bug #75363 (openssl_x509_parse leaks memory)
2017-10-12 12:30:20 +02:00
Jakub Zelenka
1f843a8fb5
Automatically load OpenSSL configuration file
2017-08-30 17:31:17 +01:00
Jakub Zelenka
58df6a3b61
Do not explicitly initialize and clean up OpenSSL for OpenSSL 1.1
2017-08-30 17:29:24 +01:00