diff options
| author | Derick Rethans <derick@php.net> | 2001-12-17 20:23:38 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2001-12-17 20:23:38 +0000 |
| commit | adffaad9f4dd9f05775d80a079deb5408b28dcf3 (patch) | |
| tree | eb3dde2fabf52a7fe8e623056794b98ed0e971c9 | |
| parent | e2fb9282aa6e3e1397b0f95ad8584f2946e2e4d8 (diff) | |
| download | php-git-adffaad9f4dd9f05775d80a079deb5408b28dcf3.tar.gz | |
MFH backward compability issues with libmcrypt
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 524a61e9b4..b1ce5b9199 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -59,6 +59,9 @@ function_entry mcrypt_functions[] = { PHP_FE(mcrypt_generic, NULL) PHP_FE(mdecrypt_generic, NULL) PHP_FE(mcrypt_generic_end, NULL) +#if HAVE_MCRYPT_GENERIC_DEINIT + PHP_FE(mcrypt_generic_deinit, NULL) +#endif PHP_FE(mcrypt_enc_self_test, NULL) PHP_FE(mcrypt_enc_is_block_algorithm_mode, NULL) PHP_FE(mcrypt_enc_is_block_algorithm, NULL) @@ -673,7 +676,12 @@ PHP_FUNCTION(mcrypt_generic_end) MCRYPT_GET_TD_ARG +#if HAVE_MCRYPT_GENERIC_DEINIT + php_error(E_NOTICE, "mcrypt_generic_end is deprecated, please use mcrypt_generic_deinit"); + if (mcrypt_generic_deinit (td) < 0) { +#else if (mcrypt_generic_end (td) < 0) { +#endif php_error (E_WARNING, "could not terminate encryption specifier"); RETURN_FALSE } @@ -682,6 +690,28 @@ PHP_FUNCTION(mcrypt_generic_end) /* }}} */ +#if HAVE_MCRYPT_GENERIC_DEINIT + +/* {{{ proto bool mcrypt_generic_deinit(resource td) + This function terminates encrypt specified by the descriptor td */ +PHP_FUNCTION(mcrypt_generic_deinit) +{ + zval **mcryptind; + MCRYPT td; + + MCRYPT_GET_TD_ARG + + if (mcrypt_generic_deinit (td) < 0) { + php_error (E_WARNING, "could not terminate encryption specifier"); + RETURN_FALSE + } + RETURN_TRUE +} +/* }}} */ + +#endif + + /* {{{ proto bool mcrypt_enc_is_block_algorithm_mode(resource td) Returns TRUE if the mode is for use with block algorithms */ PHP_FUNCTION(mcrypt_enc_is_block_algorithm_mode) |