diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
commit | 1b75bed00fa4ea3925f513f4825deb00cb158d5b (patch) | |
tree | 0822ed2a2ca42ba1acb82a6737336bbfe219bebe /sql-common | |
parent | 689ffe3559a4b7bacd13503ba93659b2f4560bbb (diff) | |
parent | b2d71434ed24d0901155fe68b0b7ee4fdad0e2d4 (diff) | |
download | mariadb-git-1b75bed00fa4ea3925f513f4825deb00cb158d5b.tar.gz |
5.5.40+ merge
Diffstat (limited to 'sql-common')
-rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index c7065925198..89f6a8434a5 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1964,6 +1964,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 |