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
a0b9554f94
Fix possible memory leak in openssl_encrypt and openssl_decrypt
2017-04-27 15:44:26 +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
Jakub Zelenka
c0203c0ceb
Do not add already added object to the internal OpenSSL table
...
This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.
2017-04-26 14:59:15 +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
Anatol Belski
f504e9eb72
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Support also no,shared configure arg vals by default
2017-04-24 16:22:16 +02:00
Anatol Belski
f7b8322b14
Support also no,shared configure arg vals by default
...
This indirectly fixes bug #74398 where --with-extname is expected to be
configured shared with our default dependency package. With a non
default deps, it still can be enforced --with-extname=static
2017-04-24 15:46:22 +02: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
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
411f4b1b6f
Fix indent and add comment
2017-03-14 18:13:57 +00:00
Jakub Zelenka
760ff21bf3
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
2017-03-14 18:13:57 +00:00
Jakub Zelenka
53cc72ef86
Remove extra SSL mode settings
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
Remi Collet
1ffb1b9597
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:42 +01:00
Aaron Piotrowski
531fbb88f5
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-23 22:56:04 -06:00
Aaron Piotrowski
ff8a6b1232
Update test for bug #74159
2017-02-23 22:24:59 -06:00
Aaron Piotrowski
c05c65ac80
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-23 21:19:46 -06:00
Aaron Piotrowski
e9873d9853
Fix bug #74159
...
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
2017-02-23 20:59:43 -06:00
andrewnester
15b8b124ae
Fixed #74099 - Memory leak with openssl_encrypt()
2017-02-17 21:23:16 +01:00
Anatol Belski
9b9080e85d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
2017-02-02 13:06:31 +01:00
Anatol Belski
6fc0ae638a
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
2017-02-02 12:48:12 +01:00
Jakub Zelenka
519b0dc886
Fix bug #73978 (openssl_decrypt triggers bug in PDO)
2017-01-25 19:55:05 +00:00
