diff options
| author | Antony Dovgal <tony2001@php.net> | 2010-05-20 11:20:44 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2010-05-20 11:20:44 +0000 |
| commit | 4463284456c4939e7999555f50b4438ebc78a50a (patch) | |
| tree | 0a7669582a5d437a889e6364c5c1bff2f4cfd243 /ext/openssl | |
| parent | 2bc3611c741ce85f537fe669cafaaf09a9d3c646 (diff) | |
| download | php-git-4463284456c4939e7999555f50b4438ebc78a50a.tar.gz | |
fix ZTS build
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/openssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 98f9454a18..94a8edbd09 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4593,7 +4593,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; @@ -4661,7 +4661,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); @@ -4740,7 +4740,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); @@ -4772,7 +4772,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) { |