commit b612799a80af398040efc2416e0d09dcb0da1cf5
author Richard Levitte <levitte@openssl.org> Tue Nov 15 14:53:33 2016 +0100
committer Richard Levitte <levitte@openssl.org> Tue Nov 15 14:53:33 2016 +0100
tree fdc1238fdb3b4c6b642373b068708af7beea2ba1
parent 6c62f9e1639a7d1a879f363a99882920104dfedb

Revert "Remove heartbeats completely"

Done too soon, this is for future OpenSSL 1.2.0

This reverts commit 6c62f9e1639a7d1a879f363a99882920104dfedb.

Reviewed-by: Rich Salz <rsalz@openssl.org>

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 8aab778..2439167 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3047,6 +3047,13 @@
         ret = 1;
         break;
 
+#ifndef OPENSSL_NO_HEARTBEATS
+    case SSL_CTRL_DTLS_EXT_SEND_HEARTBEAT:
+    case SSL_CTRL_GET_DTLS_EXT_HEARTBEAT_PENDING:
+    case SSL_CTRL_SET_DTLS_EXT_HEARTBEAT_NO_REQUESTS:
+        break;
+#endif
+
     case SSL_CTRL_CHAIN:
         if (larg)
             return ssl_cert_set1_chain(s, NULL, (STACK_OF(X509) *)parg);