diff options
author | tedu <> | 2014-04-14 18:45:55 +0000 |
---|---|---|
committer | tedu <> | 2014-04-14 18:45:55 +0000 |
commit | 95635d69892027aae43126c720bdf465c55b75b4 (patch) | |
tree | cf54816807c3e7c50d1a7df6ceac26ecda2c9f53 /src/lib/libssl/s3_srvr.c | |
parent | 4de5e966312f32adfcbfa844e67772602bb18ed6 (diff) | |
download | openbsd-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/s3_srvr.c')
-rw-r--r-- | src/lib/libssl/s3_srvr.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index 14066031ca..1f0afc2353 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c | |||
@@ -233,17 +233,6 @@ ssl3_accept(SSL *s) | |||
233 | return (-1); | 233 | return (-1); |
234 | } | 234 | } |
235 | 235 | ||
236 | #ifndef OPENSSL_NO_HEARTBEATS | ||
237 | /* If we're awaiting a HeartbeatResponse, pretend we | ||
238 | * already got and don't await it anymore, because | ||
239 | * Heartbeats don't make sense during handshakes anyway. | ||
240 | */ | ||
241 | if (s->tlsext_hb_pending) { | ||
242 | s->tlsext_hb_pending = 0; | ||
243 | s->tlsext_hb_seq++; | ||
244 | } | ||
245 | #endif | ||
246 | |||
247 | for (;;) { | 236 | for (;;) { |
248 | state = s->state; | 237 | state = s->state; |
249 | 238 | ||