From: Nikita Popov <nikic@php.net>
Date: Mon, 9 Mar 2015 10:10:52 +0000 (+0100)
Subject: Remove deprecated mcrypt_generic_end() alias
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~738
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c488a4570197240af8e05eaab95c0b308c2246d8;p=php

Remove deprecated mcrypt_generic_end() alias
---

diff --git a/NEWS b/NEWS
index 3cf7c96314..9a69062225 100644
--- 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 3291e0cb31..1312a1be3c 100644
--- 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 055ac6e720..83184f9b6f 100644
--- 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)