From ba3e66e605b4b4f147254a0b10e9cc20ce77f3f6 Mon Sep 17 00:00:00 2001
From: tedu <tedu@openbsd.org>
Date: Mon, 14 Apr 2014 18:45:55 +0000
Subject: make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt
 miod

---
 lib/libssl/src/ssl/d1_clnt.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'lib/libssl/src/ssl/d1_clnt.c')

diff --git a/lib/libssl/src/ssl/d1_clnt.c b/lib/libssl/src/ssl/d1_clnt.c
index 4c6aac7536c..1b7cbaec15d 100644
--- a/lib/libssl/src/ssl/d1_clnt.c
+++ b/lib/libssl/src/ssl/d1_clnt.c
@@ -176,18 +176,6 @@ dtls1_connect(SSL *s)
 	    s->in_handshake, NULL);
 #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) {
-		dtls1_stop_timer(s);
-		s->tlsext_hb_pending = 0;
-		s->tlsext_hb_seq++;
-	}
-#endif
-
 	for (;;) {
 		state = s->state;
 
-- 
cgit v1.2.3-59-g8ed1b