Peter Kokot
f1d7e3ca0b
Sync leading and final newlines in *.phpt sections
...
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-15 04:31:31 +02:00
Peter Kokot
17ccbeec32
Trim trailing whitespace in *.phpt
2018-10-14 19:44:14 +02:00
Peter Kokot
902d39a3a7
Trim trailing whitespace in source code files
2018-10-13 14:14:50 +02:00
Anatol Belski
922f1a0dcf
Backport changes for OpenSSL 1.1.1 CI integration
...
Add debug message for failing test parts
(cherry picked from commit a45169a6ba )
Show all unmatched errors when test failed
(cherry picked from commit 7015965254 )
More possibly colliding libs to remove from the test image
(cherry picked from commit 3008ad1a49 )
Remove colliding file from CI image
(cherry picked from commit 6220d21c34 )
Fix typo
(cherry picked from commit 24517d82cf )
2018-09-13 11:03:42 +02:00
Anatol Belski
05a4fec761
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Improve error code matching
2018-09-12 16:24:38 +02:00
Anatol Belski
19ab91781e
Improve error code matching
2018-09-12 16:22:22 +02:00
Jakub Zelenka
87a9536bda
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-09 18:58:23 +01:00
Jakub Zelenka
be50a72715
Fix ssl stream reneg limit test to print only after first renegotiation
...
It has been reported that in some setup the test does multiple
renegotiations which is allowed.
2018-09-09 18:53:55 +01:00
Jakub Zelenka
cd0a37994e
Fix stream_security_level.phpt with OpenSSL 1.1.1
2018-09-02 20:00:08 +01:00
Jakub Zelenka
73a8f72617
Merge branch 'PHP-7.1' into PHP-7.2
2018-08-19 20:19:01 +01:00
Jakub Zelenka
4c542e6c13
Fix bug #76705 (unusable ssl => peer_fingerprint in stream_context_create())
2018-08-19 20:14:26 +01:00
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
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
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
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
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
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
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