merge

gkodinov · gkodinov · commit b2027e2d2214 · 2014-07-31T12:58:24.000+03:00
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -1858,6 +1858,12 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
     DBUG_RETURN(1);
   }
 
+  if (X509_V_OK != SSL_get_verify_result(ssl))
+  {
+    *errptr= "Failed to verify the server certificate";
+    X509_free(server_cert);
+    DBUG_RETURN(1);
+  }
   /*
     We already know that the certificate exchanged was valid; the SSL library
     handled that. Now we need to verify that the contents of the certificate
