Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security

ChangeLog

@@ -1,7 +1,11 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.5.4.0 (not yet released)
+4.5.4.1 (2016-01-29)
+- issue #11892 Error with PMA 4.4.15.3
+- issue #11896 Remove hard dependency on phpseclib
+
+4.5.4.0 (2016-01-28)
 - issue #11724 live data edit of big sets is not working
 - issue        Table list not saved in db QBE bookmarked search
 - issue #11777 While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.5.4-dev
+Version 4.5.4.1
 
 A set of PHP-scripts to manage MySQL over the web.
 

doc/conf.py

@@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.5.4-dev'
+version = '4.5.4.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

libraries/Config.class.php

@@ -114,7 +114,7 @@ class PMA_Config
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.5.4-dev');
+        $this->set('PMA_VERSION', '4.5.4.1');
         /**
          * @deprecated
          */

libraries/plugins/auth/AuthenticationCookie.class.php

@@ -41,7 +41,7 @@ if (! function_exists('openssl_encrypt')
     require PHPSECLIB_INC_DIR . '/Crypt/Base.php';
     require PHPSECLIB_INC_DIR . '/Crypt/Rijndael.php';
     require PHPSECLIB_INC_DIR . '/Crypt/AES.php';
-    require PHPSECLIB_INC_DIR . '/Crypt/Random.php';
+    require_once PHPSECLIB_INC_DIR . '/Crypt/Random.php';
 }
 
 /**

libraries/session.inc.php

@@ -13,7 +13,9 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-require PHPSECLIB_INC_DIR . '/Crypt/Random.php';
+if (! function_exists('openssl_random_pseudo_bytes')) {
+    require_once PHPSECLIB_INC_DIR . '/Crypt/Random.php';
+}
 
 // verify if PHP supports session, die if it does not
 
@@ -113,7 +115,11 @@ if (! isset($_COOKIE[$session_name])) {
  * (we use "space PMA_token space" to prevent overwriting)
  */
 if (! isset($_SESSION[' PMA_token '])) {
-    $_SESSION[' PMA_token '] = bin2hex(phpseclib\Crypt\Random::string(16));
+    if (! function_exists('openssl_random_pseudo_bytes')) {
+        $_SESSION[' PMA_token '] = bin2hex(phpseclib\Crypt\Random::string(16));
+    } else {
+        $_SESSION[' PMA_token '] = bin2hex(openssl_random_pseudo_bytes(16));
+    }
 }
 
 /**
@@ -132,5 +138,9 @@ function PMA_secureSession()
     ) {
         session_regenerate_id(true);
     }
-    $_SESSION[' PMA_token '] = bin2hex(phpseclib\Crypt\Random::string(16));
+    if (! function_exists('openssl_random_pseudo_bytes')) {
+        $_SESSION[' PMA_token '] = bin2hex(phpseclib\Crypt\Random::string(16));
+    } else {
+        $_SESSION[' PMA_token '] = bin2hex(openssl_random_pseudo_bytes(16));
+    }
 }