Jakub Zelenka
587cede59d
Merge branch 'PHP-7.2'
2018-05-18 17:25:06 +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
2a2bf97a9a
Fix keylen type mismatch in openssl_pkey_derive
2018-05-11 17:05:03 +01:00
Jakub Zelenka
a76633444c
Fix openssl_pkey_derive arginfo
2018-05-09 19:38:47 +01:00
Jim Zubov
897133fbda
Add openssl_pkey_derive
2018-05-09 19:37:01 +01:00
Jakub Zelenka
8327c4c3bd
Merge branch 'PHP-7.2'
2018-04-15 20:43:17 +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
d5f84fb9c5
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix some arginfos
2018-02-23 11:32:18 +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
Gabriel Caruso
1314f0fb3a
Use int instead of long in protos
2018-02-23 11:06:20 +01:00
Gabriel Caruso
ded3d984c6
Use EXPECT instead of EXPECTF when possible
...
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2018-02-20 21:53:48 +01:00
Christoph M. Becker
e8affd805f
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix openssl_* arginfos
2018-02-20 16:26:06 +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
Gabriel Caruso
21e3b0c70c
Remove trailing whitespace in inc files
2018-02-10 19:20:23 +01:00
Gabriel Caruso
2d48d734a2
Fix some misspellings
2018-02-06 16:59:00 +01:00
Gabriel Caruso
fef879a2d6
Use bool instead of boolean while throwing a type error
...
PHP requires boolean typehints to be written "bool" and disallows
"boolean" as an alias. This changes the error messages to match
the actual type name and avoids confusing messages like "must be
of type boolean, boolean given".
This a followup to ce1d69a1f6
2018-02-04 23:09:40 +01:00
Gabriel Caruso
ce1d69a1f6
Use int instead of integer in type errors
...
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
2018-02-04 19:08:23 +01:00
Gabriel Caruso
84488d921b
Remove superfluous SKIPIF sections in more tests
2018-02-04 16:57:08 +01:00
Gabriel Caruso
8034fdc9d9
Use int instead of integer in proto
2018-02-02 22:32:15 +01:00
Jakub Zelenka
67e8445334
Merge branch 'PHP-7.2'
2018-01-30 20:09:24 +00: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
Dmitry Stogov
14d3a627c9
Eliminate useless separation
2018-01-17 12:25:49 +03:00
Gabriel Caruso
6400264856
Trailing whitespaces
...
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-03 14:38:00 +01:00
Xinchen Hui
a6519d0514
year++
2018-01-02 12:57:58 +08: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
Dmitry Stogov
83e495e0fd
Move constants into read-only data segment
2017-12-14 22:14:36 +03:00
Dmitry Stogov
9e709e2fa0
Move constants into read-only data segment
2017-12-14 18:43:44 +03:00
Dmitry Stogov
6a9d2b2190
Cleanup type conversion
2017-12-07 19:24:55 +03:00
Nikita Popov
26f8fc833b
Enable and fix printf() format warnings
...
Add _unchecked() variants of zend_spprintf and zend_strpprintf for
cases where we specifically want to disable these checks, such as
use of %H.
2017-11-16 21:15:36 +01:00
Jakub Zelenka
8b07cc4914
Merge branch 'PHP-7.2'
2017-10-30 16:44:33 +00: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
