Remove deprecated mcrypt_generic_end() alias

diff --git a/NEWS b/NEWS
index 3cf7c963145cb631e9dbffba52733b1edfa297ce..9a690622252678c05e7fad13e35fd077c948d92f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -103,6 +103,7 @@
 
 - Mcrypt:
   . Fixed possible read after end of buffer and use after free. (Dmitry)
+  . Removed mcrypt_generic_end() alias. (Nikita)
 
 - Opcache:
   . Fixed bug with try blocks being removed when extended_info opcode

diff --git a/UPGRADING b/UPGRADING
index 3291e0cb3184a9f07796fe4800e23d564161cc18..1312a1be3cb3be833f750c795908959ea9cc4cc4 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -361,6 +361,10 @@ Other
   . gmp_setbit() and gmp_clrbit() now return FALSE for negative indices, making
     them consistent with other GMP functions.
 
+- Mcrypt
+  . Removed deprecate mcrypt_generic_end() alias in favor of
+    mcrypt_generic_deinit().
+
 - Session
   . session_start() accepts all INI settings as array. e.g. ['cache_limiter'=>'private']
     sets session.cache_limiter=private. It also supports 'read_and_close' which closes

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 055ac6e7201ae493968e58c0190843591524dd01..83184f9b6fecde9a047127f85b50d11e5c0f50d4 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -258,7 +258,6 @@ const zend_function_entry mcrypt_functions[] = { /* {{{ */
        PHP_FE(mcrypt_generic_init,     arginfo_mcrypt_generic_init)
        PHP_FE(mcrypt_generic,                  arginfo_mcrypt_generic)
        PHP_FE(mdecrypt_generic,                arginfo_mdecrypt_generic)
-       PHP_DEP_FALIAS(mcrypt_generic_end, mcrypt_generic_deinit, arginfo_mcrypt_generic_deinit)
        PHP_FE(mcrypt_generic_deinit,   arginfo_mcrypt_generic_deinit)
 
        PHP_FE(mcrypt_enc_self_test,    arginfo_mcrypt_enc_self_test)