Set MySQL SSL parameters even if key is not set

User might want to set any of the SSL parameters without needing to set the key. Fixes #12293 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Jan 2, 2017 · d018add · d018add
1 parent 6a0d330
commit d018add
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
@@ -153,7 +153,12 @@ public function connect(
         /* Optionally enable SSL */
         if ($cfg['Server']['ssl']) {
             $client_flags |= MYSQLI_CLIENT_SSL;
-            if (!empty($cfg['Server']['ssl_key'])) {
+            if (! is_null($cfg['Server']['ssl_key']) ||
+                ! is_null($cfg['Server']['ssl_cert']) ||
+                ! is_null($cfg['Server']['ssl_ca']) ||
+                ! is_null($cfg['Server']['ssl_ca_paths']) ||
+                ! is_null($cfg['Server']['ssl_ciphers'])
+            ) {
                 mysqli_ssl_set(
                     $link,
                     $cfg['Server']['ssl_key'],