php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix ZTS build

Browse Source
This commit is contained in:
Antony Dovgal
2010-05-20 11:20:44 +00:00
parent 2655e63e10
commit 797bb31e24
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/openssl/openssl.c
+4 -4
View File
@@ -4598,7 +4598,7 @@ PHP_FUNCTION(openssl_digest)
}
/* }}} */
static zend_bool php_openssl_validate_iv(char **piv, int *piv_len, int iv_required_len)
static zend_bool php_openssl_validate_iv(char **piv, int *piv_len, int iv_required_len TSRMLS_DC)
{
char *iv_new;
@@ -4666,7 +4666,7 @@ PHP_FUNCTION(openssl_encrypt)
if (iv_len <= 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Using an empty Initialization Vector (iv) is potentially insecure and not recommended");
}
free_iv = php_openssl_validate_iv(&iv, &iv_len, EVP_CIPHER_iv_length(cipher_type));
free_iv = php_openssl_validate_iv(&iv, &iv_len, EVP_CIPHER_iv_length(cipher_type) TSRMLS_CC);
outlen = data_len + EVP_CIPHER_block_size(cipher_type);
outbuf = emalloc(outlen + 1);
@@ -4745,7 +4745,7 @@ PHP_FUNCTION(openssl_decrypt)
key = (unsigned char*)password;
}
free_iv = php_openssl_validate_iv(&iv, &iv_len, EVP_CIPHER_iv_length(cipher_type));
free_iv = php_openssl_validate_iv(&iv, &iv_len, EVP_CIPHER_iv_length(cipher_type) TSRMLS_CC);
outlen = data_len + EVP_CIPHER_block_size(cipher_type);
outbuf = emalloc(outlen + 1);
@@ -4777,7 +4777,7 @@ PHP_FUNCTION(openssl_decrypt)
PHP_FUNCTION(openssl_cipher_iv_length)
{
char *method;
int method_len, iv_len;
int method_len;
const EVP_CIPHER *cipher_type;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len) == FAILURE) {