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/s3_pkt.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/lib/libssl/s3_pkt.c') diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c index 6c677d9f6b..70e6acad4f 100644 --- a/src/lib/libssl/s3_pkt.c +++ b/src/lib/libssl/s3_pkt.c @@ -1022,19 +1022,6 @@ start: dest = s->s3->alert_fragment; dest_len = &s->s3->alert_fragment_len; } -#ifndef OPENSSL_NO_HEARTBEATS - else if (rr->type == TLS1_RT_HEARTBEAT) { - tls1_process_heartbeat(s); - - /* Exit and notify application to read again */ - rr->length = 0; - s->rwstate = SSL_READING; - BIO_clear_retry_flags(SSL_get_rbio(s)); - BIO_set_retry_read(SSL_get_rbio(s)); - return (-1); - } -#endif - if (dest_maxlen > 0) { n = dest_maxlen - *dest_len; /* available space in 'dest' */ if (rr->length < n) -- cgit v1.2.3-55-g6feb