summaryrefslogtreecommitdiff
path: root/ext/openssl/xp_ssl.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
| * Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64Anatol Belski2015-10-261-1/+1
| |
* | Fixed memory leak in php_stream_context_set_option()Dmitry Stogov2015-10-291-2/+3
| |
* | remove TSRMLS_*Anatol Belski2015-08-021-1/+1
| | | | | | | | either remains or merged in from PHP5
* | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-4/+4
| | | | | | | | semantick changes).
* | Dropped CN_match and SNI_server_name context optionsNikita Popov2015-04-241-15/+2
| |
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-04-141-1/+6
|\ \ | |/ | | | | | | | | | | | | * PHP-5.6: Fix Bug #69402: Reading empty SSL stream hangs until timeout Conflicts: ext/openssl/xp_ssl.c
| * Fix Bug #69402: Reading empty SSL stream hangs until timeoutDaniel Lowrey2015-04-141-4/+9
| |
* | Fixed resource leakDmitry Stogov2015-04-081-0/+4
| |
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-111-11/+7
|\ \ | |/ | | | | | | * PHP-5.6: Don't block on crypto data inside stream_select()
| * Don't block on crypto data inside stream_select()Daniel Lowrey2015-03-111-11/+7
| |
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-101-5/+12
|\ \ | |/ | | | | | | | | | | | | * PHP-5.6: Fix bug# 69215 (Crypto servers should send client CA list) Conflicts: ext/openssl/xp_ssl.c
| * Fix bug# 69215 (Crypto servers should send client CA list)Daniel Lowrey2015-03-101-5/+12
| |
* | Deprecate "session_meta_capture" SSL context optionDaniel Lowrey2015-03-091-1/+7
| | | | | | | | | | | | | | Meta data about encrypted streams is now available as part of the "crypto" key in the array returned by stream_get_meta_data(). This update deprecates the use of the "session_meta_capture" ssl context option in encrypted streams.
* | Revert "Add stream_socket_crypto_info() function"Daniel Lowrey2015-03-091-104/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13acb7ec653c543c56437ed417c3889fbf54f608. With the added capability to negotiate application layer protocols via the TLS ALPN extension userland needs a method to access the negotiated protocol on a given stream. The reverted commit added a new stream_socket_crypto_info() function for this purpose. This original approach was discarded in favor of using the already-existing stream_get_meta_data() API which specifically exists for just such purposes and requires the addition of no new functions.
* | Add crypto info to stream_get_meta_data() result on encrypted streamsDaniel Lowrey2015-03-091-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A "crypto" key is added to the output of stream_get_meta_data() calls when invoked using a stream on which crypto is currently active. The new key's associated array contains the following keys: - protocol (string e.g. TLSv1.2, TLSv1.1, etc) - cipher_name (string) - cipher_bits (int) - cipher_version (string) If the TLS ALPN extension was used to successfully negotiate an application protocol that protocol's identifier is stored in the following key: - alpn_protocol If no ALPN protocol was negotiated the "alpn_protocol" key is not present in the crypto meta data array. More meta information concerning the stream's active encryption state may be added in the future.
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-091-17/+18
|\ \ | |/ | | | | | | | | | | | | * PHP-5.6: Fix crypto stream timeout regressions Conflicts: ext/openssl/xp_ssl.c
| * Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-03-091-18/+19
| |\ | | | | | | | | | | | | * PHP-5.5: Fix crypto stream timeout regressions
| | * Fix crypto stream timeout regressionsDaniel Lowrey2015-03-091-18/+19
| | |
* | | fix data typeAnatol Belski2015-03-061-1/+1
| | |
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-1/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix stream_select() issue with OpenSSL buffer Conflicts: main/streams/streams.c
| * | Fix stream_select() issue with OpenSSL bufferChris Wright2015-03-051-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
| * | Really fix zts this timeDaniel Lowrey2015-03-051-4/+4
| | |
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix ZTS Fix ZTS build Conflicts: ext/openssl/openssl.c ext/openssl/xp_ssl.c
| * | Fix ZTSDaniel Lowrey2015-03-051-3/+3
| | |
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-1/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Fixed bug #68265 (SAN match fails with trailing DNS dot)
| * | Fixed bug #68265 (SAN match fails with trailing DNS dot)Daniel Lowrey2015-03-041-1/+7
| | |
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.6: hexadecimal is case*in*sensitive Conflicts: ext/openssl/xp_ssl.c
| * | Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6Daniel Lowrey2015-03-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | * 'PHP-5.6' of https://github.com/bjori/php-src: hexadecimal is case*in*sensitive
| | * | hexadecimal is case*in*sensitiveHannes Magnusson2015-03-041-1/+1
| | | |
* | | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-20/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #68879 (IP Address fields in subjectAltNames not used) Fix broken test Conflicts: ext/openssl/xp_ssl.c
| * | | Fixed bug #68879 (IP Address fields in subjectAltNames not used)Daniel Lowrey2015-03-041-22/+33
| |/ /
* | | Merge branch 'tls-alpn'Daniel Lowrey2015-03-041-119/+362
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tls-alpn: Improve test to target specific issue Misc updates/cleanup Add TLS ALPN extension support in crypto client/server streams Add stream_socket_crypto_info() function Update for compatibility with newer openssl libs
| * | | Misc updates/cleanupDaniel Lowrey2015-03-041-106/+89
| | | |
| * | | Add TLS ALPN extension support in crypto client/server streamsDaniel Lowrey2015-02-281-0/+124
| | | |
| * | | Add stream_socket_crypto_info() functionDaniel Lowrey2015-02-281-0/+88
| | | |
| * | | Update for OpenSSL 1.0.2 compatibilityDaniel Lowrey2015-02-281-36/+84
| | | |
* | | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-5/+17
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | * PHP-5.6: Fixed bug #68920 (use strict peer_fingerprint input checks) Conflicts: ext/openssl/xp_ssl.c
| * | Fixed bug #68920 (use strict peer_fingerprint input checks)Daniel Lowrey2015-03-041-7/+22
| | |
* | | Merge branch 'PHP-5.6'Anatol Belski2015-02-131-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: fix condition
| * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-02-131-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: fix condition
| | * fix conditionAnatol Belski2015-02-131-1/+1
| | |
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-02-091-16/+16
|\ \ \ | |/ / | | | | | | | | | Conflicts: ext/openssl/xp_ssl.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-02-091-56/+167
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/openssl/xp_ssl.c
| | * Miscellaneous cleanupDaniel Lowrey2015-02-091-28/+28
| | |
| | * Update xp_ssl.cBrad Broerman2015-02-041-2/+2
| | | | | | | | | Added TSRMLS_CC to php_openssl_sockop_io calls.
| | * reneg and should_close are not yet members of sslsock. Removing...Brad Broerman2015-01-281-9/+1
| | |
| | * Updated with SSL fixes (backported from trunk)Brad Broerman2015-01-281-45/+159
| | |
| | * Bump yearXinchen Hui2015-01-151-1/+1
| | |
View Lorry Controller Status