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

---
 lib/libssl/s3_clnt.c | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'lib/libssl/s3_clnt.c')

diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c
index 4ad8d3943ef..c1460266fe4 100644
--- a/lib/libssl/s3_clnt.c
+++ b/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;
 
-- 
cgit v1.2.3