Do not set key if not set in config

Issue #12293 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Jun 6, 2016 · 5e536ab · 5e536ab
1 parent 171bcb9
commit 5e536ab
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
@@ -150,14 +150,16 @@ public function connect(
         /* Optionally enable SSL */
         if ($cfg['Server']['ssl']) {
             $client_flags |= MYSQLI_CLIENT_SSL;
-            mysqli_ssl_set(
-                $link,
-                $cfg['Server']['ssl_key'],
-                $cfg['Server']['ssl_cert'],
-                $cfg['Server']['ssl_ca'],
-                $cfg['Server']['ssl_ca_path'],
-                $cfg['Server']['ssl_ciphers']
-            );
+            if (!empty($cfg['Server']['ssl_key'])) {
+                mysqli_ssl_set(
+                    $link,
+                    $cfg['Server']['ssl_key'],
+                    $cfg['Server']['ssl_cert'],
+                    $cfg['Server']['ssl_ca'],
+                    $cfg['Server']['ssl_ca_path'],
+                    $cfg['Server']['ssl_ciphers']
+                );
+            }
             /*
              * disables SSL certificate validation on mysqlnd for MySQL 5.6 or later
              * @link https://bugs.php.net/bug.php?id=68344