cvs: php4 /ext/mcrypt mcrypt.c

sniper Mon Jul 30 17:12:48 2001 EDT Modified files: /php4/ext/mcrypt mcrypt.c Log: Make this compile in ZTS mode. Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.56 php4/ext/mcrypt/mcrypt.c:1.57 --- php4/ext/mcrypt/mcrypt.c:1.56 Sat Jul 28 07:35:58 2001 +++ php4/ext/mcrypt/mcrypt.c Mon Jul 30 17:12:48 2001 @@ -1184,7 +1184,7 @@ /* }}} */ -static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mode, zval **iv, int argc, int dencrypt, zval* return_value) +static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mode, zval **iv, int argc, int dencrypt, zval* return_value TSRMLS_DC) { char *cipher_dir_string; char *module_dir_string; @@ -1194,7 +1194,7 @@ char *key_s = NULL, *iv_s; char *data_s; MCRYPT td; - + MCRYPT_GET_INI td = mcrypt_module_open ( @@ -1309,7 +1309,7 @@ MCRYPT_CONVERT; - php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_ENCRYPT, return_value); + php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_ENCRYPT, return_value TSRMLS_CC); } /* }}} */ @@ -1327,7 +1327,7 @@ MCRYPT_CONVERT; - php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_DECRYPT, return_value); + php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_DECRYPT, return_value TSRMLS_CC); } /* }}} */ @@ -1346,7 +1346,7 @@ MCRYPT_CONVERT_WO_MODE; convert_to_long_ex(mode); - php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ecb", iv, argc, Z_LVAL_PP(mode), return_value); + php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ecb", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC); } /* }}} */ @@ -1365,7 +1365,7 @@ MCRYPT_CONVERT_WO_MODE; convert_to_long_ex(mode); - php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cbc", iv, argc, Z_LVAL_PP(mode), return_value); + php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cbc", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC); } /* }}} */ @@ -1384,7 +1384,7 @@ MCRYPT_CONVERT_WO_MODE; convert_to_long_ex(mode); - php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cfb", iv, argc, Z_LVAL_PP(mode), return_value); + php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cfb", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC); } /* }}} */ @@ -1403,7 +1403,7 @@ MCRYPT_CONVERT_WO_MODE; convert_to_long_ex(mode); - php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ofb", iv, argc, Z_LVAL_PP(mode), return_value); + php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ofb", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC); } /* }}} */