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
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
Leigh
85589ca660
Add php_openssl_store_errors to bailouts
2017-01-18 15:02:52 +00:00
Leigh
d2f07edf71
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-18 14:47:49 +00:00
Leigh
e7e96fe2e0
Change free to OPENSSL_free
2017-01-18 14:45:41 +00:00
Thomas Punt
9977bdf9b3
Remove more TSRMLS_CC macros
2017-01-18 10:00:15 +00:00
Xinchen Hui
697809d425
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
2017-01-09 16:30:48 +08:00
Xinchen Hui
f7cb79431f
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
2017-01-09 16:30:00 +08:00
Anatol Belski
bf14ecc0d8
use the new API for opaque symbol in OpenSSL 1.1.x
2017-01-08 00:25:46 +01:00
Anatol Belski
df1e1fdcb9
implement basic config support for OpenSSL 1.1.x
2017-01-08 00:25:46 +01:00
Joe Watkins
5ae45ef993
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix memleaks from #1755 and some pre-existing ones
2017-01-07 10:15:15 +00:00
Leigh
21f287915c
Remove superfluous variable reinit
2017-01-07 09:43:05 +00:00
Leigh
62e9e1fecd
Some commentary, change free method
2017-01-06 15:49:15 +00:00
Leigh
9a0dac124e
Conditionally free depending on how assignment happened
2017-01-06 15:24:37 +00:00
Leigh
053b966134
Fix memleaks from #1755 and some pre-existing ones
2017-01-06 14:58:54 +00:00
Joe Watkins
2d42423953
Merge branch 'pull-request/1755'
...
* pull-request/1755:
Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
2017-01-06 07:43:59 +00:00
Joe Watkins
0884cffb67
Merge branch 'pull-request/1755'
...
* pull-request/1755:
Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
2017-01-06 07:42:57 +00:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Nikita Popov
2497ae031b
Don't check for precise length in ecc.phpt
...
Again, this can be off by one.
2016-12-29 22:05:38 +01:00