[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/openssl.c trunk/ext/openssl/openssl.c

[Antony Dovgal]

tony2001                                 Thu, 20 May 2010 11:20:44 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299520

Log:
fix ZTS build

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
    U   php/php-src/trunk/ext/openssl/openssl.c

Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2010-05-20 03:58:58 UTC 
(rev 299519)
+++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2010-05-20 11:20:44 UTC 
(rev 299520)
@@ -4598,7 +4598,7 @@
 }
 /* }}} */

-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 @@
        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 @@
                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_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) {

Modified: php/php-src/trunk/ext/openssl/openssl.c
===================================================================
--- php/php-src/trunk/ext/openssl/openssl.c     2010-05-20 03:58:58 UTC (rev 
299519)
+++ php/php-src/trunk/ext/openssl/openssl.c     2010-05-20 11:20:44 UTC (rev 
299520)
@@ -4593,7 +4593,7 @@
 }
 /* }}} */

-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 @@
        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 @@
                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_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) {


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php