make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod

1 files changed, 0 insertions, 12 deletions

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 164fcfbf1f..47a0c0e2a2 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -185,18 +185,6 @@ dtls1_accept(SSL *s)
                 return (-1);
         }
 
-#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) {
-                dtls1_stop_timer(s);
-                s->tlsext_hb_pending = 0;
-                s->tlsext_hb_seq++;
-        }
-#endif
-
         for (;;) {
                 state = s->state;