Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
...
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Jakub Zelenka
af79a58507
Merge branch 'openssl_error_store' into openssl_aead
2016-06-19 17:36:57 +01:00
Jakub Zelenka
d22d71b6c5
Remove test for incorrect fix of bug #69882
...
The fix just cleared the errors without storing which was wrong
2016-06-19 17:25:30 +01:00
Jakub Zelenka
e63a8540a6
Merge branch 'openssl_error_store' into openssl_aead
2016-06-19 17:05:48 +01:00
Jakub Zelenka
53071e6470
Remove expected openssl errors that are not needed anymore
2016-06-19 16:46:27 +01:00
Jakub Zelenka
c2b90805e8
Merge branch 'master' into openssl_error_store
2016-06-19 16:20:02 +01:00
Anatol Belski
d6b649f6da
fix test portability
2016-06-17 17:03:13 +02:00
Jakub Zelenka
e2904ffa65
Merge branch 'PHP-7.0'
2016-06-16 20:12:50 +01:00
Jakub Zelenka
307e546e1a
Merge branch 'PHP-5.6' into PHP-7.0
2016-06-16 20:11:54 +01:00
Jakub Zelenka
0c34f53c93
Fix incorrect error suppressing in openssl_error_string test
2016-06-16 20:11:02 +01:00
Jakub Zelenka
84948e6382
Fix occasionally failing OpenSSL DH bug test
...
The test was failing when first byte was 0
2016-06-16 20:09:17 +01:00
Jakub Zelenka
b44cf1a854
Merge branch 'PHP-7.0' into openssl_error_store
2016-06-12 18:56:55 +01:00
Jakub Zelenka
e933da9028
Merge branch 'PHP-7.0'
2016-06-12 18:40:24 +01:00
Jakub Zelenka
a2f4c32eb1
Merge branch 'PHP-5.6' into PHP-7.0
2016-06-12 18:39:32 +01:00
Jakub Zelenka
0e2447cd11
Fix bug #71915 (openssl_random_pseudo_bytes is not fork-safe)
...
Add time to the entropy before using RAND_bytes
2016-06-12 18:14:21 +01:00
Jakub Zelenka
54310d95f9
Fix bug #72336 (openssl_pkey_new does not fail for invalid DSA params)
2016-06-12 18:14:21 +01:00
Jakub Zelenka
4056edd20d
Update openssl_error_string to run and be more forgiving
2016-06-12 18:14:21 +01:00
Jakub Zelenka
296aa365ca
Merge branch 'PHP-7.0'
2016-06-08 18:37:32 +01:00
Jakub Zelenka
84dce33b04
Merge branch 'PHP-5.6' into PHP-7.0
2016-06-08 18:36:36 +01:00
Jakub Zelenka
05033c9ebd
Fix bug #72140 (segfault after calling ERR_free_strings())
2016-06-08 18:21:39 +01:00
Anatol Belski
edf769c023
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix typo
2016-06-06 08:58:40 +02:00
Anatol Belski
174c3371bd
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix typo
2016-06-06 08:58:08 +02:00
Anatol Belski
eaef8f6db2
fix typo
2016-06-06 08:56:40 +02:00
Anatol Belski
db68121da8
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix broken skipif and add xfail for now
2016-06-06 08:23:22 +02:00
Anatol Belski
075c75873e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix broken skipif and add xfail for now
2016-06-06 08:21:39 +02:00
Anatol Belski
1b2afd478b
fix broken skipif and add xfail for now
2016-06-06 08:20:01 +02:00
Jakub Zelenka
da83e4295a
Merge branch 'PHP-7.0'
2016-06-05 17:31:05 +01:00
Jakub Zelenka
1f7535234e
Merge branch 'PHP-5.6' into PHP-7.0
2016-06-05 17:30:03 +01:00
Jakub Zelenka
d4615d1118
Add new test for openssl_pkey_new
2016-06-05 17:27:47 +01:00
Jakub Zelenka
497fe33d6f
Add test for openssl_error_string
...
This test is important for making sure that the error strings
from OpenSSL works as expected and we can safely add a fix
for storing the strings that is prepared.
2016-06-05 17:23:05 +01:00
Jakub Zelenka
5e9f387175
Remove openssl_x509_parse for OpenSSL 0.9.x
...
The test is unstable and it actually fails with latest 0.9.8
2016-06-05 16:28:50 +01:00
Anatol Belski
80f91fd9d5
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Re-fix #72165
Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
2016-05-06 09:33:22 +02:00
Anatol Belski
5afba67bfe
Re-fix #72165
...
Reverted previous wrong patch, throw warning for numeric keys.
Numeric field names are not supported, see "distinguished name"
section here https://www.openssl.org/docs/manmaster/apps/req.html
2016-05-06 09:30:41 +02:00
Anatol Belski
dd5479ea4c
Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
...
This reverts commit 7277c85765
.
2016-05-06 09:19:04 +02:00
Anatol Belski
20ae634bf0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72165 Null pointer dereference - openssl_csr_new
2016-05-06 09:02:14 +02:00
Anatol Belski
7277c85765
Fixed bug #72165 Null pointer dereference - openssl_csr_new
2016-05-06 09:01:27 +02:00
Joe Watkins
66fc5a3436
Implement #51879 stream context socket option tcp_nodelay
2016-04-29 12:11:58 +01:00
Jakub Zelenka
6ac8bc4ecb
Merge branch 'openssl_error_store' of github.com:bukka/php-src into openssl_error_store
2016-04-03 19:56:15 +01:00
Jakub Zelenka
df85331220
Correctly store OpenSSL erorrs for encrypt_key
2016-04-03 19:54:39 +01:00
Jakub Zelenka
79dd71b151
Store OpenSSL errors from CONF_get_string in SET_OPTIONAL_STRING_ARG
2016-04-03 19:51:22 +01:00
Jakub Zelenka
7a4cc73641
Merge branch 'openssl_error_store' into openssl_aead_with_error_store
2016-02-29 19:34:39 +00:00
Jakub Zelenka
70141093a7
Merge branch 'master' into openssl_aead
2016-02-29 19:31:20 +00:00
Jakub Zelenka
80015ba741
Merge branch 'PHP-7.0' into openssl_error_store
2016-02-29 19:28:40 +00:00
Stanislav Malyshev
9afb29aa68
Remove TSRMLS_* from code, they are not used anymore
2016-02-17 22:44:05 -08:00
Anatol Belski
343307000e
yet two test fixes in openssl in 5.6
2016-02-16 08:28:10 +01:00
Anatol Belski
08086d40a5
Merge branch 'PHP-7.0'
...
* PHP-7.0:
improve test
2016-02-16 08:06:57 +01:00
Anatol Belski
84014cf733
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
improve test
2016-02-16 08:06:38 +01:00
Anatol Belski
974dea5e88
improve test
2016-02-16 08:05:16 +01:00
Jakub Zelenka
4ea2a0fd60
Store errors in openssl_random_pseudo_bytes
2016-02-14 19:25:14 +00:00