diff options
| author | tedu <> | 2014-04-14 18:45:55 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-14 18:45:55 +0000 |
| commit | 93a6b2842272dd679e23ad66d53239bd36b3c4f0 (patch) | |
| tree | cf54816807c3e7c50d1a7df6ceac26ecda2c9f53 /src/lib/libssl/d1_lib.c | |
| parent | 13e83c1cefc0f26760c14a634f0b2be629163d6e (diff) | |
| download | openbsd-93a6b2842272dd679e23ad66d53239bd36b3c4f0.tar.gz openbsd-93a6b2842272dd679e23ad66d53239bd36b3c4f0.tar.bz2 openbsd-93a6b2842272dd679e23ad66d53239bd36b3c4f0.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.c | 7 |
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 | } |
