diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-06-26 12:47:36 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-06-26 12:47:36 +0500 |
| commit | a61b679d3e6f4f5d4634a883ce3b4e4c7a722758 (patch) | |
| tree | 1cba43db3b6011169f56cf4992aa49eca9167fdf /vio/viossl.c | |
| parent | 4eef86c60b0439eb612c2d3ab764c10f8e6cd0c1 (diff) | |
| download | mariadb-git-a61b679d3e6f4f5d4634a883ce3b4e4c7a722758.tar.gz | |
Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possible
sql/sql_acl.cc:
Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viossl.c:
Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viosslfactories.c:
Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 834343a77d9..fc95b0755ce 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -287,8 +287,7 @@ int sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio, long timeout) SSL_SESSION_set_timeout(SSL_get_session(vio->ssl_), timeout); SSL_set_fd(vio->ssl_,vio->sd); SSL_set_accept_state(vio->ssl_); - if (SSL_do_handshake(vio->ssl_) < 1 || - SSL_get_verify_result(vio->ssl_) != X509_V_OK) + if (SSL_do_handshake(vio->ssl_) < 1) { DBUG_PRINT("error", ("SSL_do_handshake failure")); report_errors(); @@ -361,8 +360,7 @@ int sslconnect(struct st_VioSSLConnectorFd* ptr, Vio* vio, long timeout) SSL_SESSION_set_timeout(SSL_get_session(vio->ssl_), timeout); SSL_set_fd (vio->ssl_, vio->sd); SSL_set_connect_state(vio->ssl_); - if (SSL_do_handshake(vio->ssl_) < 1 || - SSL_get_verify_result(vio->ssl_) != X509_V_OK) + if (SSL_do_handshake(vio->ssl_) < 1) { DBUG_PRINT("error", ("SSL_do_handshake failure")); report_errors(); |