diff --git a/ChangeLog b/ChangeLog index 0622f059a4..1f4cd9ac29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ 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 diff --git a/composer.json b/composer.json index 363f6658c5..fcc525a838 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "phpmyadmin/sql-parser": "^4.2.3", "phpmyadmin/motranslator": "^3.0", "phpmyadmin/shapefile": "^2.0", - "phpseclib/phpseclib": "^2.0", + "phpseclib/phpseclib": "^2.0.8", "google/recaptcha": "^1.1", "psr/container": "^1.0", "twig/twig": "^1.32", diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index 7ce1ad7339..2d7a7c7c7b 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -720,7 +720,7 @@ class AuthenticationCookie extends AuthenticationPlugin $iv ); } else { - $cipher = new Crypt\AES(Crypt\Base::MODE_CBC); + $cipher = new Crypt\AES('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(Crypt\Base::MODE_CBC); + $cipher = new Crypt\AES('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(Crypt\Base::MODE_CBC); - return $cipher->block_size; + $cipher = new Crypt\AES('cbc'); + return $cipher->getBlockLengthInBytes(); } /**