summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Collapse)AuthorAgeFilesLines
* Fixed SNI failure from missing Z_STRVAL_PPDaniel Lowrey2014-02-041-1/+1
|
* Remove #if PHP_VERSION_ID version checksDaniel Lowrey2014-02-011-20/+0
|
* Use master-agnostic zend_is_true checksDaniel Lowrey2014-01-311-4/+26
|
* Fixed build breakage from b4b4d9697fDaniel Lowrey2014-01-291-15/+10
|
* Verify peers by default in client socket operationsDaniel Lowrey2014-01-289-56/+193
|
* Prevent invalid SAN peer verification on null byte prefix attackDaniel Lowrey2014-01-271-7/+18
|
* Bump yearXinchen Hui2014-01-033-3/+3
|
* Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-121-2/+2
|\ | | | | | | | | * PHP-5.5: Fixed bug #65486 mysqli_poll() is broken on Win x64
| * Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this issue is visible in mysqli_poll() functions, the cause lays deeper in the stream to socket casting API. On Win x64 the SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like it's 32 bit signed integer. The game of casting 32 bit var to/from 64 bit pointer back and forth is the best way to break it. Further more, while socket and file descriptors are always integers on Linux, those are different things using different APIs on Windows. Even though using integer instead of SOCKET might work on Windows, this issue might need to be revamped more carefully later. By this time this patch is tested well with phpt and apps and shows no regressions, neither in mysqli_poll() nor in any other parts.
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-111-1/+1
|\ \ | |/ | | | | | | * PHP-5.5: fix dir separator in cve-2013-6420 test
| * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-111-1/+1
| |\ | | | | | | | | | | | | * PHP-5.4: fix dir separator in cve-2013-6420 test
| | * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-12-111-1/+1
| | |\ | | | | | | | | | | | | | | | | * PHP-5.3: fix dir separator in cve-2013-6420 test
| | | * fix dir separator in cve-2013-6420 testAnatol Belski2013-12-111-1/+1
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2013-12-103-4/+61
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.5: 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-103-4/+61
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.4: 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
| | * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-12-103-4/+61
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse Conflicts: configure.in main/php_version.h
| | | * Fix CVE-2013-6420 - memory corruption in openssl_x509_parseStanislav Malyshev2013-12-103-4/+61
| | | |
* | | | Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-srcMichael Wallner2013-10-181-6/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * 'openssl_compile_warning_fix' of https://github.com/bukka/php-src: Fix compiler warnings in openssl.c
| * | | | Fix compiler warnings in openssl.cJakub Zelenka2013-10-131-6/+4
| | | | |
* | | | | previous revert killed that fileMichael Wallner2013-10-171-0/+33
| | | | |
* | | | | Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-srcMichael Wallner2013-10-174-2/+184
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'updated_tls_support' of https://github.com/rdlowrey/php-src: Added support for TLSv1.1 and TLSv1.2 Conflicts: ext/openssl/xp_ssl.c
| * | | | | Added support for TLSv1.1 and TLSv1.2Daniel Lowrey2013-10-084-1/+161
| | | | | |
* | | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-175-217/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Revert "TLS news" Revert "Added support for TLSv1.1 and TLSv1.2"
| * | | | | | Revert "Added support for TLSv1.1 and TLSv1.2"Michael Wallner2013-10-175-217/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2aaa3d538a7b93d92c52aec95707d8230f21be65.
* | | | | | | fix wsMichael Wallner2013-10-171-5/+5
| | | | | | |
* | | | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-174-2/+161
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Added support for TLSv1.1 and TLSv1.2 Conflicts: ext/openssl/xp_ssl.c
| * | | | | Added support for TLSv1.1 and TLSv1.2Daniel Lowrey2013-10-175-2/+217
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: ext/openssl/xp_ssl.c
* | | | | Fixes broken zts build (recent openssl changes)Daniel Lowrey2013-10-121-10/+10
| | | | |
* | | | | C89Michael Wallner2013-10-091-1/+2
| | | | |
* | | | | Merge branch 'san_peer_matching' of https://github.com/rdlowrey/php-srcMichael Wallner2013-10-094-19/+161
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'san_peer_matching' of https://github.com/rdlowrey/php-src: Changed return types to zend_bool, renamed test Added SAN matching during peer verification
| * | | | | Changed return types to zend_bool, renamed testDaniel Lowrey2013-10-092-8/+11
| | | | | |
| * | | | | Added SAN matching during peer verificationDaniel Lowrey2013-10-084-19/+158
| | |/ / / | |/| | |
* | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-091-12/+14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * PHP-5.5: C89 compatibility
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-10-091-12/+14
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * PHP-5.4: C89 compatibility
| | * | | C89 compatibilityMichael Wallner2013-10-091-12/+14
| | | | |
* | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-091-5/+6
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | * PHP-5.5: Fixed segfault when built with OpenSSL >= 1.0.1 fixing a minor typo in CODING_STANDARDS document FIX BUG #65219 - Typo correction FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
| * | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-10-091-5/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed segfault when built with OpenSSL >= 1.0.1 fixing a minor typo in CODING_STANDARDS document FIX BUG #65219 - Typo correction FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
| | * | Fixed segfault when built with OpenSSL >= 1.0.1Daniel Lowrey2013-10-091-5/+6
| | | | | | | | | | | | | | | | (PR #481)
* | | | Merge branch 'ssl-streams-crypto-method' of https://github.com/mj/php-srcMichael Wallner2013-10-083-1/+139
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'ssl-streams-crypto-method' of https://github.com/mj/php-src: Add unit test that covers setting the crypto method. Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
| * | | | Add unit test that covers setting the crypto method.Martin Jansen2013-10-042-0/+110
| | | | |
| * | | | Streams for ssl:// transports can now be configured to use a specificMartin Jansen2013-09-211-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crypto method (SSLv3, SSLv2 etc.) by calling stream_context_set_option($ctx, "ssl", "crypto_method", $crypto_method) where $crypto_method can be one of STREAM_CRYPTO_METHOD_SSLv2_CLIENT, STREAM_CRYPTO_METHOD_SSLv3_CLIENT, STREAM_CRYPTO_METHOD_SSLv23_CLIENT or STREAM_CRYPTO_METHOD_TLS_CLIENT. SSLv23 remains the default crypto method. This change makes it possible to fopen() SSL URLs that are only provided using SSL v3.
* | | | | Merge branch 'bug65729' of https://github.com/datibbaw/php-srcMichael Wallner2013-10-083-13/+115
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'bug65729' of https://github.com/datibbaw/php-src: DNS name comparison is now case insensitive. Use zend_bool as return value for _match() Added two more test cases for CN matching. yay, reduced one variable Fixed bug that would lead to out of bounds memory access added better wildcard matching for CN
| * | | | | DNS name comparison is now case insensitive.datibbaw2013-10-082-4/+5
| | | | | |
| * | | | | Use zend_bool as return value for _match()Tjerk Meesters2013-10-071-5/+2
| | | | | |
| * | | | | Added two more test cases for CN matching.Tjerk Meesters2013-10-071-7/+18
| | | | | |
| * | | | | yay, reduced one variableTjerk Meesters2013-09-211-4/+2
| | | | | |
| * | | | | Fixed bug that would lead to out of bounds memory accessTjerk Meesters2013-09-211-18/+28
| | | | | |
| * | | | | added better wildcard matching for CNTjerk Meesters2013-09-213-10/+95
| |/ / / /
* | | | | Using SUCCESS and FAILURE for return valuesdatibbaw2013-10-071-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Using zend_bool for boolean arguments and return values Reduced one level of zval indirection where possible
* | | | | show method in error messageTjerk Meesters2013-09-301-1/+1
| | | | |
View Lorry Controller Status