diff options
| author | Matt Caswell <matt@openssl.org> | 2015-09-08 09:13:50 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-10-30 08:38:18 +0000 |
| commit | 49ae742398aecd81551d59f421e4116a5b8a4ea9 (patch) | |
| tree | 5be83a4941071f7a3ff96b4cfcd643735d87ad02 /ssl/s3_lib.c | |
| parent | c130dd8ea4d09cb708aac9e41bd25c2f5fa7ea38 (diff) | |
Remove redundant code
Clean up and remove lots of code that is now no longer needed due to the
move to the new state machine.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 292fb1b3cc..2111d18aee 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -5014,7 +5014,7 @@ int ssl3_shutdown(SSL *s) * Don't do anything much if we have not done the handshake or we don't * want to send messages :-) */ - if ((s->quiet_shutdown) || (s->state == SSL_ST_BEFORE)) { + if ((s->quiet_shutdown) || (SSL_in_before(s))) { s->shutdown = (SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); return (1); } @@ -5128,10 +5128,9 @@ int ssl3_renegotiate_check(SSL *s) && !SSL_in_init(s)) { /* * if we are the server, and we have sent a 'RENEGOTIATE' - * message, we need to go to SSL_ST_ACCEPT. + * message, we need to set the state machine into the renegotiate + * state. */ - /* SSL_ST_ACCEPT */ - s->state = SSL_ST_RENEGOTIATE; statem_set_renegotiate(s); s->s3->renegotiate = 0; s->s3->num_renegotiations++; |