archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve OpenSSL compile flag compatibility, minor updates

Browse source
This commit is contained in:
Daniel Lowrey 2014-02-20 17:20:40 -07:00
parent 3a9829af20
commit 9f94e0b51c
3 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/openssl/tests/bug66501.phpt
View file

@ -3,7 +3,7 @@ Bug #66501: EC private key support in openssl_sign
--SKIPIF-- --SKIPIF--
<?php <?php
if (!extension_loaded("openssl")) die("skip"); if (!extension_loaded("openssl")) die("skip");
if (!defined(OPENSSL_KEYTYPE_EC)) die("skip no EC available); if (!defined('OPENSSL_KEYTYPE_EC')) die("skip no EC available");
--FILE-- --FILE--
<?php <?php
$pkey = 'ASN1 OID: prime256v1 $pkey = 'ASN1 OID: prime256v1

1
ext/openssl/tests/tlsv1.0_wrapper.phpt
View file

@ -3,7 +3,6 @@ tlsv1.0 stream wrapper
--SKIPIF-- --SKIPIF--
<?php <?php
if (!extension_loaded("openssl")) die("skip"); if (!extension_loaded("openssl")) die("skip");
if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSL 1.0.1 required");
if (!function_exists('pcntl_fork')) die("skip no fork"); if (!function_exists('pcntl_fork')) die("skip no fork");
--FILE-- --FILE--
<?php <?php

32
ext/openssl/xp_ssl.c
View file

@ -325,7 +325,7 @@ static const SSL_METHOD *php_select_crypto_method(long method_value, int is_clie
return is_client ? TLSv1_2_client_method() : TLSv1_2_server_method(); return is_client ? TLSv1_2_client_method() : TLSv1_2_server_method();
#else #else
php_error_docref(NULL TSRMLS_CC, E_WARNING, php_error_docref(NULL TSRMLS_CC, E_WARNING,
"TLSv1.1 support is not compiled into the OpenSSL library PHP is linked against"); "TLSv1.2 support is not compiled into the OpenSSL library PHP is linked against");
return NULL; return NULL;
#endif #endif
} else { } else {
@ -344,38 +344,25 @@ static long php_get_crypto_method_ctx_flags(long method_flags TSRMLS_DC)
ssl_ctx_options |= SSL_OP_NO_SSLv2; ssl_ctx_options |= SSL_OP_NO_SSLv2;
} }
#endif #endif
#ifndef OPENSSL_NO_SSL3
if (!(method_flags & STREAM_CRYPTO_METHOD_SSLv3)) { if (!(method_flags & STREAM_CRYPTO_METHOD_SSLv3)) {
ssl_ctx_options |= SSL_OP_NO_SSLv3; ssl_ctx_options |= SSL_OP_NO_SSLv3;
} }
#endif
#ifndef OPENSSL_NO_TLS1
if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_0)) { if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_0)) {
ssl_ctx_options |= SSL_OP_NO_TLSv1; ssl_ctx_options |= SSL_OP_NO_TLSv1;
} }
#endif
if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_1)) {
#if OPENSSL_VERSION_NUMBER >= 0x10001001L #if OPENSSL_VERSION_NUMBER >= 0x10001001L
if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_1)) {
ssl_ctx_options |= SSL_OP_NO_TLSv1_1; ssl_ctx_options |= SSL_OP_NO_TLSv1_1;
#endif
} else {
#if OPENSSL_VERSION_NUMBER < 0x10001001L
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"TLSv1.1 support is not compiled into the OpenSSL library PHP is linked against");
return -1;
#endif
} }
if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_2)) { if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_2)) {
#if OPENSSL_VERSION_NUMBER >= 0x10001001L
ssl_ctx_options |= SSL_OP_NO_TLSv1_2; ssl_ctx_options |= SSL_OP_NO_TLSv1_2;
#endif
} else {
#if OPENSSL_VERSION_NUMBER < 0x10001001L
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"TLSv1.2 support is not compiled into the OpenSSL library PHP is linked against");
return -1;
#endif
} }
#endif
return ssl_ctx_options; return ssl_ctx_options;
} }
@ -388,6 +375,7 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
const SSL_METHOD *method; const SSL_METHOD *method;
long ssl_ctx_options; long ssl_ctx_options;
long method_flags; long method_flags;
zval **val;
if (sslsock->ssl_handle) { if (sslsock->ssl_handle) {
if (sslsock->s.is_blocked) { if (sslsock->s.is_blocked) {
@ -431,8 +419,6 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL #if OPENSSL_VERSION_NUMBER >= 0x0090806fL
{ {
zval **val;
if (stream->context && SUCCESS == php_stream_context_get_option( if (stream->context && SUCCESS == php_stream_context_get_option(
stream->context, "ssl", "no_ticket", &val) && stream->context, "ssl", "no_ticket", &val) &&
zend_is_true(*val) zend_is_true(*val)
@ -444,8 +430,6 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
#if OPENSSL_VERSION_NUMBER >= 0x10000000L #if OPENSSL_VERSION_NUMBER >= 0x10000000L
{ {
zval **val;
if (stream->context && (FAILURE == php_stream_context_get_option( if (stream->context && (FAILURE == php_stream_context_get_option(
stream->context, "ssl", "disable_compression", &val) || stream->context, "ssl", "disable_compression", &val) ||
zend_is_true(*val)) zend_is_true(*val))