summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/d1_srvr.c
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-04-14 18:45:55 +0000
committertedu <tedu@openbsd.org>2014-04-14 18:45:55 +0000
commitba3e66e605b4b4f147254a0b10e9cc20ce77f3f6 (patch)
treeaf5a6b1ba8701d28384a70c5fc4c5522ba1f2740 /lib/libssl/src/ssl/d1_srvr.c
parentRemove eng_cryptodev.c (merged into old-name hw_cryptodev.c); move (diff)
downloadwireguard-openbsd-ba3e66e605b4b4f147254a0b10e9cc20ce77f3f6.tar.xz
wireguard-openbsd-ba3e66e605b4b4f147254a0b10e9cc20ce77f3f6.zip
make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod
Diffstat (limited to 'lib/libssl/src/ssl/d1_srvr.c')
-rw-r--r--lib/libssl/src/ssl/d1_srvr.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c
index 164fcfbf1ff..47a0c0e2a26 100644
--- a/lib/libssl/src/ssl/d1_srvr.c
+++ b/lib/libssl/src/ssl/d1_srvr.c
@@ -185,18 +185,6 @@ dtls1_accept(SSL *s)
return (-1);
}
-#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;