summaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-11-15 14:55:40 +0100
committerRichard Levitte <levitte@openssl.org>2019-03-29 13:50:59 +0100
commit558ea84743918f7a93bfbfc259f86ad1fa4c8de9 (patch)
tree16690b411af8e6456852f57d41b0aff86a4ecf16 /apps/s_server.c
parentd88736df4d19521664ebb125ff66e0d7b085a53c (diff)
Remove heartbeats completely
Fixes #4856 Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1928)
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index fbbfd6c940..92d4579aeb 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2507,14 +2507,6 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
*/
goto err;
}
-#ifndef OPENSSL_NO_HEARTBEATS
- if ((buf[0] == 'B') && ((buf[1] == '\n') || (buf[1] == '\r'))) {
- BIO_printf(bio_err, "HEARTBEATING\n");
- SSL_heartbeat(con);
- i = 0;
- continue;
- }
-#endif
if ((buf[0] == 'r') && ((buf[1] == '\n') || (buf[1] == '\r'))) {
SSL_renegotiate(con);
i = SSL_do_handshake(con);