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 | 797bb31e2413dc5ae2bb08c1bce6226dd3a658c4 (patch) | |
| tree | 8d14ba6fbca79b70dc0393843338bce18788d34f | |
| parent | 2655e63e10d15f62e51c9360b61fcd4b19182d6d (diff) | |
| download | php-git-797bb31e2413dc5ae2bb08c1bce6226dd3a658c4.tar.gz | |
fix ZTS build
| -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 7db22a6ef4..b1ef0a76c6 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -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) { |