diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-13 16:24:02 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-11-13 16:24:02 -0500 |
| commit | e72040c1dcd61d6669762a60924b8fa3a48c37fc (patch) | |
| tree | 705018484273d9b97682a1748bcf9518aaf41ee7 /ssl/statem/statem.c | |
| parent | 349d1cfddcfa33d352240582a3803f2eba39d9a0 (diff) | |
Remove heartbeat support
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1669)
Diffstat (limited to 'ssl/statem/statem.c')
| -rw-r--r-- | ssl/statem/statem.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index 901a3f2c49..a1da2a4418 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -251,20 +251,6 @@ static int state_machine(SSL *s, int server) } #endif -#ifndef OPENSSL_NO_HEARTBEATS - /* - * If we're awaiting a HeartbeatResponse, pretend we already got and - * don't await it anymore, because Heartbeats don't make sense during - * handshakes anyway. - */ - if (s->tlsext_hb_pending) { - if (SSL_IS_DTLS(s)) - dtls1_stop_timer(s); - s->tlsext_hb_pending = 0; - s->tlsext_hb_seq++; - } -#endif - /* Initialise state machine */ if (st->state == MSG_FLOW_RENEGOTIATE) { |