commit 9f1dc8254effa6c430618020b08e04ab3ce8157c
author David Benjamin <davidben@google.com> Tue Jun 07 17:03:46 2016 -0400
committer David Benjamin <davidben@google.com> Wed Jun 08 19:24:32 2016 +0000
tree 3022b458b8279fc965c6a105888b8102157b26d6
parent df50eecfbce6c0f4614044e84869c3f43b78fc5b

A bit of cleanup post state machine merging.

Reorder states and functions by where they appear in the handshake. Remove
unnecessary hooks on SSL_PROTOCOL_METHOD.

Change-Id: I78dae9cf70792170abed6f38510ce870707e82ff
Reviewed-on: https://boringssl-review.googlesource.com/8184
Reviewed-by: David Benjamin <davidben@google.com>

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 9c8e723..b72cacb 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -514,13 +514,13 @@
 void SSL_set_connect_state(SSL *ssl) {
   ssl->server = 0;
   ssl->state = SSL_ST_CONNECT;
-  ssl->handshake_func = ssl->method->ssl_connect;
+  ssl->handshake_func = ssl3_connect;
 }
 
 void SSL_set_accept_state(SSL *ssl) {
   ssl->server = 1;
   ssl->state = SSL_ST_ACCEPT;
-  ssl->handshake_func = ssl->method->ssl_accept;
+  ssl->handshake_func = ssl3_accept;
 }
 
 void SSL_set_bio(SSL *ssl, BIO *rbio, BIO *wbio) {
@@ -579,8 +579,6 @@
     SSL_set_connect_state(ssl);
   }
 
-  assert(ssl->handshake_func == ssl->method->ssl_connect);
-
   return SSL_do_handshake(ssl);
 }
 
@@ -590,8 +588,6 @@
     SSL_set_accept_state(ssl);
   }
 
-  assert(ssl->handshake_func == ssl->method->ssl_accept);
-
   return SSL_do_handshake(ssl);
 }