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_msg.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_msg.c')
| -rw-r--r-- | ssl/s3_msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c index fcf4744190..8d7f042f83 100644 --- a/ssl/s3_msg.c +++ b/ssl/s3_msg.c @@ -118,7 +118,7 @@ int ssl3_do_change_cipher_spec(SSL *s) const char *sender; int slen; - if (s->state & SSL_ST_ACCEPT) + if (s->server) i = SSL3_CHANGE_CIPHER_SERVER_READ; else i = SSL3_CHANGE_CIPHER_CLIENT_READ; @@ -143,7 +143,7 @@ int ssl3_do_change_cipher_spec(SSL *s) * we have to record the message digest at this point so we can get it * before we read the finished message */ - if (s->state & SSL_ST_CONNECT) { + if (!s->server) { sender = s->method->ssl3_enc->server_finished_label; slen = s->method->ssl3_enc->server_finished_label_len; } else { |