Anatol Belski
c93a360661
fix _timezone usage for vc14
2015-05-10 18:17:24 +02:00
Eric F
321bafccde
Update openssl.c
...
Adding additional checks for sslv3.
2015-03-30 01:30:09 +02:00
Leigh
456f4a78d2
Add RAND_egd check for compiling against LibreSSL
2015-03-27 13:33:22 +01:00
Leigh
a04ab4b54b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add RAND_egd check for compiling against LibreSSL
2015-03-27 13:26:48 +01:00
Leigh
1b2d58a364
Add RAND_egd check for compiling against LibreSSL
2015-03-27 13:24:36 +01:00
Anatol Belski
19360f386e
cleanup mod version macros, round 3
2015-03-23 20:54:55 +01:00
Dmitry Stogov
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
Daniel Lowrey
00c35cb6a5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
Conflicts:
ext/openssl/openssl.c
2015-03-06 11:31:04 -07:00
Daniel Lowrey
0928bad9ac
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
2015-03-06 11:29:56 -07:00
Daniel Lowrey
010f17534f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix ZTS build
2015-03-05 12:13:33 -07:00
Daniel Lowrey
e892f5382f
Fix ZTS build
2015-03-05 12:12:55 -07:00
Daniel Lowrey
c34ee4b146
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67403 (Add signatureType to openssl_x509_parse)
5.5.24 now
Conflicts:
ext/openssl/openssl.c
2015-03-05 10:27:11 -07:00
Daniel Lowrey
5939de35a8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67403 (Add signatureType to openssl_x509_parse)
5.5.24 now
Conflicts:
configure.in
main/php_version.h
2015-03-05 10:21:32 -07:00
Daniel Lowrey
94140afa69
Fix bug #67403 (Add signatureType to openssl_x509_parse)
2015-03-05 10:09:06 -07:00
Daniel Lowrey
a39b1898fe
Misc updates/cleanup
2015-03-04 09:24:27 -05:00
Daniel Lowrey
3ff36c265f
Update for OpenSSL 1.0.2 compatibility
2015-02-28 17:41:29 -05:00
Jakub Zelenka
0676f39ee4
Remove unnecessary resource checks in openssl ext
...
The resource val is already checking Z_TYPE_P(val) == IS_RESOURCE.
There is no need to call extended resource fetch functions though.
2015-02-17 20:46:36 +00:00
Xinchen Hui
10fe317300
Merge branch 'PHP-5.6'
...
Conflicts:
ext/openssl/openssl.c
2015-02-16 14:18:08 +08:00
Xinchen Hui
8309988111
Fixed bug #68912 (Segmentation fault at openssl_spki_new)
2015-02-16 14:16:52 +08:00
Xinchen Hui
e98caf27ea
found type is unnecessary
2015-02-02 14:45:19 +08:00
Xinchen Hui
942809909e
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
Anatol Belski
085907d168
fix datatype mismatches, improved error checks
2015-01-30 13:52:11 +01:00
Anatol Belski
3acdbaeba0
fix datatype mismatch warns, improve error check
2015-01-30 12:14:27 +01:00
Anatol Belski
397615071c
make the cleanup function as static, as it's not exported
2015-01-30 11:20:25 +01:00
Anatol Belski
f6330f9912
fix datatype mismatches, add stronger error checks
2015-01-30 11:10:11 +01:00
Anatol Belski
55936775d2
fix datatype mismatches, improve error checks
2015-01-30 11:02:25 +01:00
Anatol Belski
4d16937449
fix unportable dereferencing
2015-01-28 15:15:38 +01:00
Dmitry Stogov
23b683c0d3
Fixed wrong size
2015-01-26 15:33:10 +03:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Daniel Lowrey
80a337bba1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed bug #55618 (use case-insensitive cert name matching)
2015-01-14 18:04:41 +01:00
Daniel Lowrey
e2fe8e164f
Fixed bug #55618 (use case-insensitive cert name matching)
2015-01-14 18:02:50 +01:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Xinchen Hui
b5b617674e
Micro optimaztion (yeah, I know compiler supposed to do that)
2014-12-22 00:10:46 -05:00
Anatol Belski
50a93357fb
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
fix perms
fix perms
PowerPC64 support in safe_address function
2014-12-16 08:42:18 +01:00
Remi Collet
ee0b922ece
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix perms
2014-12-16 08:38:29 +01:00
Remi Collet
181f34f375
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix perms
2014-12-16 08:37:56 +01:00
Remi Collet
9c4de388c6
fix perms
2014-12-16 08:37:48 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Stanislav Malyshev
c64949626d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Fixes memory leak introduced in 2b9af967
2014-11-30 18:32:56 -08:00
Stanislav Malyshev
8c08124c0e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
2014-11-30 18:24:23 -08:00
Dominic Luechinger
6048ac32b4
Adds test cases for openssl EC improvements
2014-11-30 18:17:48 -08:00
Dominic Luechinger
5d1cc7d135
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
...
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details
Conflicts:
ext/openssl/openssl.c
2014-11-30 18:02:55 -08:00
Dominic Luechinger
e795675845
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
...
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details
2014-11-24 02:04:37 +01:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
Anatol Belski
7d6c3e01c9
fix remaining 's' args for openssl
2014-08-28 00:05:29 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
b9514bb8fd
master renames phase 6
2014-08-25 21:26:42 +02:00
