Merge branch 'QA_5_1'

Signed-off-by: William Desportes <williamdes@wdes.fr>

ChangeLog

@@ -91,6 +91,7 @@ phpMyAdmin - ChangeLog
 - issue #13614 Fixed escaping the database names when granting privileges on tables
 - issue #11834 Fixed adding a new user on "privileges" tab of a table with a database name using a "_" character
 - issue #17033 Fixed scaling of line width and point size in GIS visualization
+- issue #17054 Removed "DEL" character from generated random strings for Blowfish secret auto-generated by setup
 
 5.1.1 (2021-06-04)
 - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa

composer.json

@@ -101,7 +101,7 @@
         "samyoul/u2f-php-server": "^1.1",
         "symfony/console": "^5.2.3",
         "tecnickcom/tcpdf": "^6.4.2",
-        "vimeo/psalm": "^4.9.1"
+        "vimeo/psalm": "^4.9.2"
     },
     "extra": {
         "branch-alias": {

libraries/classes/Util.php

@@ -2614,8 +2614,8 @@ class Util
             // Get random byte and strip highest bit
             // to get ASCII only range
             $byte = ord((string) $randomFunction(1)) & 0x7f;
-            // We want only ASCII chars
-            if ($byte <= 32) {
+            // We want only ASCII chars and no DEL character (127)
+            if ($byte <= 32 || $byte === 127) {
                 continue;
             }