gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all references to deprecated extension mcrypt

Browse Source 
"Warning
This feature was DEPRECATED in PHP 7.1.0, and REMOVED in PHP 7.2.0."

It was added in: b9b6b45a4f

I did this change because Sphinx complained about "Warning, treated as error:
/home/travis/build/williamdes/phpmyadmintest/doc/glossary.rst:217:duplicate term description of mcrypt, other instance in glossary" in a documentation added 7 years ago. 

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-04-05 20:50:57 +02:00
parent 45c3db8aec
commit 5ab7d56008
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/faq.rst
View File

@ -520,8 +520,8 @@ error log file might give a clue.
-----------------------------------------------------------------------------------------------------------
If your cluster consist of different architectures, PHP code used for
encryption/decryption won't work correct. This is caused by use of
pack/unpack functions in code. Only solution is to use mcrypt
encryption/decryption won't work correctly. This is caused by use of
pack/unpack functions in code. Only solution is to use openssl
extension which works fine in this case.
.. _faq1_38:

10
doc/glossary.rst
View File

@ -210,16 +210,6 @@ From Wikipedia, the free encyclopedia
.. seealso:: <https://www.php.net/manual/en/book.mbstring.php>
MCrypt
a cryptographic library.
.. seealso:: <https://en.wikipedia.org/wiki/MCrypt>
mcrypt
the MCrypt PHP extension.
.. seealso:: <https://www.php.net/mcrypt>
Media type
A media type (formerly known as MIME type) is a two-part identifier
for file formats and format contents transmitted on the Internet.

4
libraries/classes/Plugins/Auth/AuthenticationCookie.php
View File

@ -788,7 +788,7 @@ class AuthenticationCookie extends AuthenticationPlugin
/**
* Encryption using openssl's AES or phpseclib's AES
* (phpseclib uses mcrypt when it is available)
* (phpseclib uses anoher extension when it is available)
*
* @param string $data original data
* @param string $secret the secret
@ -827,7 +827,7 @@ class AuthenticationCookie extends AuthenticationPlugin
/**
* Decryption using openssl's AES or phpseclib's AES
* (phpseclib uses mcrypt when it is available)
* (phpseclib uses anoher extension when it is available)
*
* @param string $encdata encrypted data
* @param string $secret the secret

11
test/php.ini
View File

@ -1748,17 +1748,6 @@ soap.wsdl_cache_limit = 5
; Sets the maximum number of open links or -1 for unlimited.
ldap.max_links = -1
[mcrypt]
; For more information about mcrypt settings see http://php.net/mcrypt-module-open
; Directory where to load mcrypt algorithms
; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
;mcrypt.algorithms_dir=
; Directory where to load mcrypt modes
; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
;mcrypt.modes_dir=
[dba]
;dba.default_handler=