diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-09-28 16:22:54 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-09-28 16:22:54 +0200 |
| commit | dc06af6d80a79ce18d3cb7ba407063032dccbc38 (patch) | |
| tree | 30f3d6543ffa83ef74c18ec807bc143c480fa944 /vio | |
| parent | b5de7e8e012dba2ba670916d1aa152da9a77a0c6 (diff) | |
| parent | 05145957614f268f6a78d27c0fb32525dba7c0e2 (diff) | |
| download | mariadb-git-dc06af6d80a79ce18d3cb7ba407063032dccbc38.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into neptunus.(none):/home/msvensson/mysql/work/my51-work
vio/viossl.c:
Auto merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viossl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index e869493c604..180c7a50fa7 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -167,10 +167,9 @@ int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout) SSL_clear(ssl); SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); SSL_set_fd(ssl, vio->sd); - SSL_set_accept_state(ssl); - if (SSL_do_handshake(ssl) < 1) + if (SSL_accept(ssl) < 1) { - DBUG_PRINT("error", ("SSL_do_handshake failure")); + DBUG_PRINT("error", ("SSL_accept failure")); report_errors(ssl); SSL_free(ssl); vio->ssl_arg= 0; @@ -242,10 +241,9 @@ int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout) SSL_clear(ssl); SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); SSL_set_fd(ssl, vio->sd); - SSL_set_connect_state(ssl); - if (SSL_do_handshake(ssl) < 1) + if (SSL_connect(ssl) < 1) { - DBUG_PRINT("error", ("SSL_do_handshake failure")); + DBUG_PRINT("error", ("SSL_connect failure")); report_errors(ssl); SSL_free(ssl); vio->ssl_arg= 0; |