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
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
, which
implements the same change for integer->int.
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
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
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
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
5ce7113467
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix bug #75307 Wrong reflection for openssl_open function
2017-10-27 16:07:30 +01: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
d5127cec6a
Merge branch 'PHP-7.2'
2017-10-22 18:59:32 +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
Jelle van der Waa
8106688575
openssl: add basic openssl_get_cert_locations test
...
Add a simple test for openssl_get_cert_locations, verifying the returned
array structure.
2017-08-19 15:31:27 +02:00
Anatol Belski
cb7e42da25
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Add test for bug #74903
2017-07-24 17:03:24 +02:00
Anatol Belski
2dc81d4a09
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add test for bug #74903
2017-07-24 17:02:55 +02:00
Anatol Belski
a769d873f8
Add test for bug #74903
2017-07-24 17:02:10 +02:00
Joe Watkins
52964bbfb2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
openssl: Add openssl_pkcs12_export_to_file tests
2017-07-24 10:47:02 +01:00
Joe Watkins
5816ce330c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
openssl: Add openssl_pkcs12_export_to_file tests
2017-07-24 10:46:52 +01:00
Jelle van der Waa
23c124ec75
openssl: Add openssl_pkcs12_export_to_file tests
...
Add basic tests for openssl_pkcs12_export_to_file.
2017-07-24 10:46:42 +01:00
Jakub Zelenka
26982e36d5
Add support for OpenSSL security level
2017-07-17 17:40:51 +01:00
Jakub Zelenka
c08dba3431
Allow setting SNI cert and pk in separate files
2017-07-16 16:15:43 +01:00
Stanislav Malyshev
d75dbb0e31
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Improve fix for #74145
Fix wddx
Fix tests
Fixed bug #74111
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #74087
Fixed parsing of strange formats with mixed month/day and time strings
Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
Fixed bug #74111
Fix #74435 : Buffer over-read into uninitialized memory
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #73807
2017-07-04 21:23:16 -07:00
Stanislav Malyshev
0ba04f7737
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Improve fix for #74145
Fix wddx
Fix tests
Fixed bug #74111
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #74087
Fixed parsing of strange formats with mixed month/day and time strings
Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
Fixed bug #74111
Fix #74435 : Buffer over-read into uninitialized memory
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #73807
2017-07-04 21:18:10 -07:00
Stanislav Malyshev
73cabfedf5
Fix bug #74651 - check EVP_SealInit as it can return -1
2017-07-04 19:30:56 -07:00
Jakub Zelenka
e657f0d3f2
Merge branch 'PHP-7.1'
2017-06-25 18:11:10 +01:00
Jakub Zelenka
0c707fcb10
Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding
...
It fixes bug #71917 (openssl_open() returns junk on envelope < 16 bytes)
and bug #72362 (OpenSSL Blowfish encryption is incorrect for short
keys).
2017-06-25 18:08:50 +01:00
Anatol Belski
eb68301df1
Relax test condition, as OpenSSL 1.1.x out differs in EOL only
2017-06-24 00:25:51 +02:00
Anatol Belski
d7b9eb981a
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
2017-06-24 00:24:56 +02:00