make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod

1 files changed, 0 insertions, 11 deletions

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 4ad8d3943e..c1460266fe 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -202,17 +202,6 @@ ssl3_connect(SSL *s)
         if (!SSL_in_init(s) || SSL_in_before(s))
                 SSL_clear(s);
 
-#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) {
-                s->tlsext_hb_pending = 0;
-                s->tlsext_hb_seq++;
-        }
-#endif
-
         for (;;) {
                 state = s->state;