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

---
 src/lib/libssl/d1_lib.c | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/lib/libssl/d1_lib.c')

diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index 3da7c36545..73c44c807a 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -433,13 +433,6 @@ dtls1_handle_timeout(SSL *s)
 		s->d1->timeout.read_timeouts = 1;
 	}
 
-#ifndef OPENSSL_NO_HEARTBEATS
-	if (s->tlsext_hb_pending) {
-		s->tlsext_hb_pending = 0;
-		return dtls1_heartbeat(s);
-	}
-#endif
-
 	dtls1_start_timer(s);
 	return dtls1_retransmit_buffered_messages(s);
 }
-- 
cgit v1.2.3-55-g6feb