summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_lib.c
diff options
context:
space:
mode:
authortedu <>2014-04-14 18:45:55 +0000
committertedu <>2014-04-14 18:45:55 +0000
commit95635d69892027aae43126c720bdf465c55b75b4 (patch)
treecf54816807c3e7c50d1a7df6ceac26ecda2c9f53 /src/lib/libssl/d1_lib.c
parent4de5e966312f32adfcbfa844e67772602bb18ed6 (diff)
downloadopenbsd-95635d69892027aae43126c720bdf465c55b75b4.tar.gz
openbsd-95635d69892027aae43126c720bdf465c55b75b4.tar.bz2
openbsd-95635d69892027aae43126c720bdf465c55b75b4.zip
make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod
Diffstat (limited to 'src/lib/libssl/d1_lib.c')
-rw-r--r--src/lib/libssl/d1_lib.c7
1 files changed, 0 insertions, 7 deletions
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)
433 s->d1->timeout.read_timeouts = 1; 433 s->d1->timeout.read_timeouts = 1;
434 } 434 }
435 435
436#ifndef OPENSSL_NO_HEARTBEATS
437 if (s->tlsext_hb_pending) {
438 s->tlsext_hb_pending = 0;
439 return dtls1_heartbeat(s);
440 }
441#endif
442
443 dtls1_start_timer(s); 436 dtls1_start_timer(s);
444 return dtls1_retransmit_buffered_messages(s); 437 return dtls1_retransmit_buffered_messages(s);
445} 438}