make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod

1 files changed, 0 insertions, 21 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 926071fffa..68a4b8ca2d 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -3319,27 +3319,6 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                 ret = 1;
                 break;
 
-#ifndef OPENSSL_NO_HEARTBEATS
-        case SSL_CTRL_TLS_EXT_SEND_HEARTBEAT:
-                if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
-                        ret = dtls1_heartbeat(s);
-                else
-                        ret = tls1_heartbeat(s);
-                break;
-
-        case SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING:
-                ret = s->tlsext_hb_pending;
-                break;
-
-        case SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS:
-                if (larg)
-                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_DONT_RECV_REQUESTS;
-                else
-                        s->tlsext_heartbeat &= ~SSL_TLSEXT_HB_DONT_RECV_REQUESTS;
-                ret = 1;
-                break;
-#endif
-
 #endif /* !OPENSSL_NO_TLSEXT */
         default:
                 break;