diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
| commit | 65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch) | |
| tree | 7fe642e7d6e685ed87fbd292d986b871b5e0a720 /sql-common/client.c | |
| parent | 9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff) | |
| parent | 36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff) | |
| download | mariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz | |
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 94f50eae30b..00573de415b 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1815,7 +1815,8 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c */ #ifdef HAVE_X509_check_host - ret_validation= X509_check_host(server_cert, server_hostname, 0, 0, 0) != 1; + ret_validation= X509_check_host(server_cert, server_hostname, + strlen(server_hostname), 0, 0) != 1; #else subject= X509_get_subject_name(server_cert); cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1); @@ -2505,10 +2506,10 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, if (mysql->client_flag & CLIENT_MULTI_STATEMENTS) mysql->client_flag|= CLIENT_MULTI_RESULTS; -#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) +#ifdef HAVE_OPENSSL if (mysql->options.use_ssl) mysql->client_flag|= CLIENT_SSL; -#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY*/ +#endif /* HAVE_OPENSSL */ if (mpvio->db) mysql->client_flag|= CLIENT_CONNECT_WITH_DB; |