diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 21:18:09 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 21:18:09 -0700 |
| commit | 3e0a1a71e951bfb29bd43c6341b2e72f4386377f (patch) | |
| tree | 5628d6c4e4150c9f39e66075b37b627890313f94 /main | |
| parent | 88cfc6ccb6594e8bacd4adce45094dc2d4d65eac (diff) | |
| parent | 10bc5fd4c4c8e1dd57bd911b086e9872a56300a0 (diff) | |
| download | php-git-3e0a1a71e951bfb29bd43c6341b2e72f4386377f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug (#69195 Inconsistent stream crypto values across versions)
Conflicts:
ext/standard/http_fopen_wrapper.c
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/php_stream_transport.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/main/streams/php_stream_transport.h b/main/streams/php_stream_transport.h index a47f669f98..650307c295 100644 --- a/main/streams/php_stream_transport.h +++ b/main/streams/php_stream_transport.h @@ -167,19 +167,25 @@ typedef struct _php_stream_xport_param { typedef enum { STREAM_CRYPTO_METHOD_SSLv2_CLIENT = (1 << 1 | 1), STREAM_CRYPTO_METHOD_SSLv3_CLIENT = (1 << 2 | 1), - STREAM_CRYPTO_METHOD_SSLv23_CLIENT = ((1 << 1) | (1 << 2) | 1), + /* v23 no longer negotiates SSL2 or SSL3 */ + STREAM_CRYPTO_METHOD_SSLv23_CLIENT = ((1 << 3) | (1 << 4) | (1 << 5) | 1), STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT = (1 << 3 | 1), STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT = (1 << 4 | 1), STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT = (1 << 5 | 1), - STREAM_CRYPTO_METHOD_TLS_CLIENT = ((1 << 3) | (1 << 4) | (1 << 5) | 1), + /* tls now equates only to the specific TLSv1 method for BC with pre-5.6 */ + STREAM_CRYPTO_METHOD_TLS_CLIENT = (1 << 3 | 1), + STREAM_CRYPTO_METHOD_TLS_ANY_CLIENT = ((1 << 3) | (1 << 4) | (1 << 5) | 1), STREAM_CRYPTO_METHOD_ANY_CLIENT = ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5) | 1), STREAM_CRYPTO_METHOD_SSLv2_SERVER = (1 << 1), STREAM_CRYPTO_METHOD_SSLv3_SERVER = (1 << 2), - STREAM_CRYPTO_METHOD_SSLv23_SERVER = ((1 << 1) | (1 << 2)), + /* v23 no longer negotiates SSL2 or SSL3 */ + STREAM_CRYPTO_METHOD_SSLv23_SERVER = ((1 << 3) | (1 << 4) | (1 << 5)), STREAM_CRYPTO_METHOD_TLSv1_0_SERVER = (1 << 3), STREAM_CRYPTO_METHOD_TLSv1_1_SERVER = (1 << 4), STREAM_CRYPTO_METHOD_TLSv1_2_SERVER = (1 << 5), - STREAM_CRYPTO_METHOD_TLS_SERVER = ((1 << 3) | (1 << 4) | (1 << 5)), + /* tls equates only to the specific TLSv1 method for BC with pre-5.6 */ + STREAM_CRYPTO_METHOD_TLS_SERVER = (1 << 3), + STREAM_CRYPTO_METHOD_TLS_ANY_SERVER = ((1 << 3) | (1 << 4) | (1 << 5)), STREAM_CRYPTO_METHOD_ANY_SERVER = ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5)) } php_stream_xport_crypt_method_t; |