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

Revert "Compatibility with phpseclib 2.0.8"

Browse Source 
This reverts commit a450935e53.

We really need to stick on 2.0.7 for 4.7 branch to keep PHP 5.5 support.

Issue #13846
This commit is contained in:
Michal Čihař 2017-11-29 09:34:44 +01:00 committed by Isaac Bennetch
parent 8ec35df577
commit c5d3009d0a
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -10,7 +10,6 @@ phpMyAdmin - ChangeLog
- issue #13821 Lock page when changes are done in the SQL editor
- issue #13842 Prefer iconv for encoding conversions
- issue #13737 Fixed changing password on MariaDB cluster
- issue #13846 Compatibility with phpseclib 2.0.8
4.7.5 (2017-10-23)
- issue #13615 Avoid problems with browsing unknown query types

2
composer.json
View File

@ -42,7 +42,7 @@
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"tecnickcom/tcpdf": "^6.2",
"phpseclib/phpseclib": "^2.0.8",
"phpseclib/phpseclib": "^2.0",
"google/recaptcha": "^1.1"
},
"suggest": {

8
libraries/plugins/auth/AuthenticationCookie.php
View File

@ -762,7 +762,7 @@ class AuthenticationCookie extends AuthenticationPlugin
$iv
);
} else {
$cipher = new Crypt\AES('cbc');
$cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
$cipher->setIV($iv);
$cipher->setKey($aes_secret);
$result = base64_encode($cipher->encrypt($data));
@ -814,7 +814,7 @@ class AuthenticationCookie extends AuthenticationPlugin
base64_decode($data['iv'])
);
} else {
$cipher = new Crypt\AES('cbc');
$cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
$cipher->setIV(base64_decode($data['iv']));
$cipher->setKey($aes_secret);
$result = $cipher->decrypt(base64_decode($data['payload']));
@ -833,8 +833,8 @@ class AuthenticationCookie extends AuthenticationPlugin
if ($this->_use_openssl) {
return openssl_cipher_iv_length('AES-128-CBC');
}
$cipher = new Crypt\AES('cbc');
return $cipher->getBlockLengthInBytes();
$cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
return $cipher->block_size;
}
/**