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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-11-29 09:45:11 +01:00
commit cef7ca5d37
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

@ -52,7 +52,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

@ -48,7 +48,7 @@
"phpmyadmin/sql-parser": "^4.2.3",
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"phpseclib/phpseclib": "^2.0.8",
"phpseclib/phpseclib": "^2.0,<2.0.8",
"google/recaptcha": "^1.1",
"psr/container": "^1.0",
"twig/twig": "^1.32",

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

@ -720,7 +720,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));
@ -772,7 +772,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']));
@ -791,8 +791,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;
}
/**