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

Fixes broken zts build (recent openssl changes)

Browse source
This commit is contained in:
Daniel Lowrey 2013-10-09 15:39:06 -04:00 • committed by Nikita Popov
parent 0ca4b6c083
commit 9d57243794
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/openssl/openssl.c
View file

@ -1672,7 +1672,7 @@ PHP_FUNCTION(openssl_x509_export)
} }
/* }}} */ /* }}} */
static int php_openssl_x509_fingerprint(X509 *peer, const char *method, zend_bool raw, char **out, int *out_len) static int php_openssl_x509_fingerprint(X509 *peer, const char *method, zend_bool raw, char **out, int *out_len TSRMLS_DC)
{ {
unsigned char md[EVP_MAX_MD_SIZE]; unsigned char md[EVP_MAX_MD_SIZE];
const EVP_MD *mdtype; const EVP_MD *mdtype;
@ -1699,13 +1699,13 @@ static int php_openssl_x509_fingerprint(X509 *peer, const char *method, zend_boo
return SUCCESS; return SUCCESS;
} }
static int php_x509_fingerprint_cmp(X509 *peer, const char *method, const char *expected) static int php_x509_fingerprint_cmp(X509 *peer, const char *method, const char *expected TSRMLS_DC)
{ {
char *fingerprint; char *fingerprint;
int fingerprint_len; int fingerprint_len;
int result = -1; int result = -1;
if (php_openssl_x509_fingerprint(peer, method, 0, &fingerprint, &fingerprint_len) == SUCCESS) { if (php_openssl_x509_fingerprint(peer, method, 0, &fingerprint, &fingerprint_len TSRMLS_CC) == SUCCESS) {
result = strcmp(expected, fingerprint); result = strcmp(expected, fingerprint);
efree(fingerprint); efree(fingerprint);
} }
@ -1713,7 +1713,7 @@ static int php_x509_fingerprint_cmp(X509 *peer, const char *method, const char *
return result; return result;
} }
static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val) static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC)
{ {
if (Z_TYPE_P(val) == IS_STRING) { if (Z_TYPE_P(val) == IS_STRING) {
const char *method = NULL; const char *method = NULL;
@ -1728,7 +1728,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val)
break; break;
} }
return method && php_x509_fingerprint_cmp(peer, method, Z_STRVAL_P(val)) == 0; return method && php_x509_fingerprint_cmp(peer, method, Z_STRVAL_P(val) TSRMLS_CC) == 0;
} else if (Z_TYPE_P(val) == IS_ARRAY) { } else if (Z_TYPE_P(val) == IS_ARRAY) {
HashPosition pos; HashPosition pos;
zval **current; zval **current;
@ -1744,7 +1744,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val)
if (key_type == HASH_KEY_IS_STRING if (key_type == HASH_KEY_IS_STRING
&& Z_TYPE_PP(current) == IS_STRING && Z_TYPE_PP(current) == IS_STRING
&& php_x509_fingerprint_cmp(peer, key, Z_STRVAL_PP(current)) != 0 && php_x509_fingerprint_cmp(peer, key, Z_STRVAL_PP(current) TSRMLS_CC) != 0
) { ) {
return 0; return 0;
} }
@ -1776,7 +1776,7 @@ PHP_FUNCTION(openssl_x509_fingerprint)
RETURN_FALSE; RETURN_FALSE;
} }
if (php_openssl_x509_fingerprint(cert, method, raw_output, &fingerprint, &fingerprint_len) == SUCCESS) { if (php_openssl_x509_fingerprint(cert, method, raw_output, &fingerprint, &fingerprint_len TSRMLS_CC) == SUCCESS) {
RETVAL_STRINGL(fingerprint, fingerprint_len, 0); RETVAL_STRINGL(fingerprint, fingerprint_len, 0);
} else { } else {
RETVAL_FALSE; RETVAL_FALSE;
@ -5009,7 +5009,7 @@ static zend_bool matches_san_list(X509 *peer, const char *subject_name)
return is_match; return is_match;
} }
static zend_bool matches_common_name(X509 *peer, const char *subject_name) static zend_bool matches_common_name(X509 *peer, const char *subject_name TSRMLS_DC)
{ {
char buf[1024]; char buf[1024];
X509_NAME *cert_name; X509_NAME *cert_name;
@ -5068,7 +5068,7 @@ int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stre
if (GET_VER_OPT("peer_fingerprint")) { if (GET_VER_OPT("peer_fingerprint")) {
if (Z_TYPE_PP(val) == IS_STRING || Z_TYPE_PP(val) == IS_ARRAY) { if (Z_TYPE_PP(val) == IS_STRING || Z_TYPE_PP(val) == IS_ARRAY) {
if (!php_x509_fingerprint_match(peer, *val)) { if (!php_x509_fingerprint_match(peer, *val TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Peer fingerprint doesn't match"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Peer fingerprint doesn't match");
return FAILURE; return FAILURE;
} }
@ -5082,7 +5082,7 @@ int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stre
if (cnmatch) { if (cnmatch) {
if (matches_san_list(peer, cnmatch)) { if (matches_san_list(peer, cnmatch)) {
return SUCCESS; return SUCCESS;
} else if (matches_common_name(peer, cnmatch)) { } else if (matches_common_name(peer, cnmatch TSRMLS_CC)) {
return SUCCESS; return SUCCESS;
} else { } else {
return FAILURE; return FAILURE;