cvs: php4 /ext/mcrypt mcrypt.c
| From: | Derick Rethans | Date: | Mon, 17 Dec 2001 20:18:18 +0000 |
| Subject: | cvs: php4 /ext/mcrypt mcrypt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8699@lists.php.net to get a copy of this message | ||
derick Mon Dec 17 15:18:18 2001 EDT
Modified files:
/php4/ext/mcrypt mcrypt.c
Log:
- Try to be a little bit more sane dealing backwards compability
Index: php4/ext/mcrypt/mcrypt.c
diff -u php4/ext/mcrypt/mcrypt.c:1.71 php4/ext/mcrypt/mcrypt.c:1.72
--- php4/ext/mcrypt/mcrypt.c:1.71 Sat Dec 15 08:17:55 2001
+++ php4/ext/mcrypt/mcrypt.c Mon Dec 17 15:18:16 2001
@@ -678,9 +678,11 @@
MCRYPT_GET_TD_ARG
#if HAVE_MCRYPT_GENERIC_DEINIT
- php_error(E_WARNING, "mcrypt_generic_end is deprecated, please use
mcrypt_generic_deinit");
-#endif
+ 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
}