Reduce code for SSL_connect and SSL_accept

There is no need to call SSL_set_accept_state + SSL_do_handshake when we know that SSL_accept should be done. 


vio/viossl.c:
  Replace the double calls to "SSL_set_accept_state" and "SSL_do_handshake" with one call to "SSL_accept"
  Same with "SSL_connect"

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;