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
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
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
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
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
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
b714309056
Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
...
The patch for bug #74720 was incomplete.
2017-06-24 00:18:57 +02:00
Jakub Zelenka
fbb884e532
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-18 19:08:51 +01:00
Jelle van der Waa
509f5097ab
openssl: Add openssl_pkcs12_(read, export) tests
...
Add basic tests for openssl_pkcs12_read and openssl_pkcs12_export.
openssl_pkcs12_export has two tests disable which currently do not work
as intended and should be fixed.
2017-06-18 19:02:51 +01:00
Anatol Belski
cbe73b3cfe
Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
...
content
2017-06-09 17:35:37 +02:00
Anatol Belski
26f217bf40
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
follow up fix on bug #74022
2017-05-18 12:07:09 +02:00
Anatol Belski
464c1639ae
follow up fix on bug #74022
2017-05-18 12:03:13 +02:00
Jakub Zelenka
6028fe511e
Fix bug #73808 (iv length warning too restrictive for aes-128-ccm)
2017-04-30 19:46:27 +01:00
Jakub Zelenka
d83d5f4198
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-27 15:11:52 +01:00
Jakub Zelenka
7b392c7154
Prefer using DIRECTORY_SEPARATOR in OpenSSL config path
2017-04-27 15:10:55 +01:00
Jakub Zelenka
e7166ea9be
Add oid_section to the testing openssl.cnf
...
It tests repeated OID addition
2017-04-27 15:09:58 +01:00
Remi Collet
3f6d9fe9cc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
rely on bundle config, instead of system one
2017-04-26 14:41:54 +02:00
Remi Collet
f639b64dca
rely on bundle config, instead of system one
2017-04-26 14:41:40 +02:00
Remi Collet
7962185ded
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
skip the test on OpenSSL < 1.1 for now
2017-04-26 14:39:14 +02:00
Anatol Belski
8cfaea656c
skip the test on OpenSSL < 1.1 for now
2017-04-26 14:39:03 +02:00
Jakub Zelenka
7260f65c62
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-24 17:12:55 +01:00
Jakub Zelenka
9fa347997a
Fix bug #73833 (null character not allowed in openssl_pkey_get_private)
2017-04-24 17:11:36 +01:00
Jakub Zelenka
ba83b18ce3
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-23 20:31:24 +01:00
Jakub Zelenka
366b1640d0
Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key)
2017-04-23 20:30:14 +01:00
Xinchen Hui
3431132f18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 19:03:09 +08:00
Xinchen Hui
42e576ace2
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 19:02:50 +08:00
Jakub Zelenka
cdc33251d2
Add OpenSSL 1.1.0 support to PHP 7.0
2017-04-07 19:21:33 +01:00
Anatol Belski
adc49b1d18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "extend skip section"
2017-04-04 16:23:49 +02:00
Anatol Belski
4ca3468e78
Revert "extend skip section"
...
This reverts commit 5136048064 .
This is not needed anymore wrt dst handling fix
2017-04-04 16:21:23 +02:00
Nikita Popov
32dcc1eef0
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-02 01:08:24 +02:00
Moritz Fain
46d286574b
Fixed bug #74341
...
Added support for ASN.1 UTCTime without seconds part (being 11 characters
long instead of 13).
Additionally, fixed incorrect handling of DST on systems without gmtoff.
2017-04-02 01:04:32 +02:00
Jakub Zelenka
7dd52cbcdd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-20 16:08:16 +00:00
Jakub Zelenka
6d066dc421
Lower timeout in test for but #72333
2017-03-20 16:07:12 +00:00
Jakub Zelenka
ebc75dab50
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 19:08:26 +00:00
Jakub Zelenka
df135ffa7a
Make test 002 for bug #65538 not to use https in cafile
2017-03-17 19:07:32 +00:00
Jakub Zelenka
b0ba8c68cd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 18:12:37 +00:00
Jakub Zelenka
53e2c9158d
Consume data by server in test for bug #72333
...
Client should be able to write more data and prevent time out
2017-03-17 18:11:50 +00:00
Jakub Zelenka
3becfb9be4
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-16 18:12:54 +00:00
Jakub Zelenka
0c8ad36d92
Make test for bug #72333 a bit more reliable
2017-03-16 18:11:56 +00:00
Jakub Zelenka
b4f0174e5c
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 18:46:29 +00:00
Jakub Zelenka
ba70478a21
Skip bug74159 test for OpenSSL lower than 1.0.1
2017-03-14 18:13:57 +00:00
Jakub Zelenka
8e5d080d54
Tidy up test for bug72333
2017-03-14 18:13:57 +00:00
Jakub Zelenka
f0e67d1a56
Speed up test for bug72333
...
It reliably fails without the xp_ssl.c so it is good with smaller usleep
2017-03-14 18:13:57 +00:00
Jakub Zelenka
17e9fc9bfe
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
2017-03-14 18:13:57 +00:00