diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
| commit | c07325f932abef2032b2e56532f6cb615e2a1161 (patch) | |
| tree | 754ca158e45ebc014e5cbeaf4c3e7581f9575d76 /sql-common/client.c | |
| parent | 7f8187bc432f79afe4c0549d68845a68e6c159ab (diff) | |
| parent | 2ae83affef5a4d89f38272db31a400f968279a7a (diff) | |
| download | mariadb-git-c07325f932abef2032b2e56532f6cb615e2a1161.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index c66cb1a749d..8596d1cafee 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* This file is included by both libmysql.c (the MySQL client C API) @@ -1575,8 +1575,10 @@ 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, - strlen(server_hostname), 0, 0) != 1; + ret_validation= + (X509_check_host(server_cert, server_hostname, + strlen(server_hostname), 0, 0) != 1) && + (X509_check_ip_asc(server_cert, server_hostname, 0) != 1); #else subject= X509_get_subject_name(server_cert); cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1); |