diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-06 11:22:28 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-15 10:45:21 +0100 |
| commit | 6c62f9e1639a7d1a879f363a99882920104dfedb (patch) | |
| tree | c3696f02ee053fc5bf9e2250b811973d5aaedd51 /apps | |
| parent | 54c68d35c6b7e7650856beb949b45363ce40ca93 (diff) | |
Remove heartbeats completely
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1669)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/openssl.c | 3 | ||||
| -rw-r--r-- | apps/s_cb.c | 17 | ||||
| -rw-r--r-- | apps/s_client.c | 7 | ||||
| -rw-r--r-- | apps/s_server.c | 8 |
4 files changed, 0 insertions, 35 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index f6a8f9df55..a4159138e5 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -628,9 +628,6 @@ static void list_disabled(void) #ifdef OPENSSL_NO_GOST BIO_puts(bio_out, "GOST\n"); #endif -#ifdef OPENSSL_NO_HEARTBEATS - BIO_puts(bio_out, "HEARTBEATS\n"); -#endif #ifdef OPENSSL_NO_IDEA BIO_puts(bio_out, "IDEA\n"); #endif diff --git a/apps/s_cb.c b/apps/s_cb.c index d5c308ee13..a2e8cbc8e2 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -555,22 +555,6 @@ void msg_cb(int write_p, int version, int content_type, const void *buf, case 23: str_content_type = "ApplicationData"; break; -#ifndef OPENSSL_NO_HEARTBEATS - case 24: - str_details1 = ", Heartbeat"; - - if (len > 0) { - switch (bp[0]) { - case 1: - str_details1 = ", HeartbeatRequest"; - break; - case 2: - str_details1 = ", HeartbeatResponse"; - break; - } - } - break; -#endif } } @@ -611,7 +595,6 @@ static STRINT_PAIR tlsext_types[] = { {"SRP", TLSEXT_TYPE_srp}, {"signature algorithms", TLSEXT_TYPE_signature_algorithms}, {"use SRTP", TLSEXT_TYPE_use_srtp}, - {"heartbeat", TLSEXT_TYPE_heartbeat}, {"session ticket", TLSEXT_TYPE_session_ticket}, {"renegotiation info", TLSEXT_TYPE_renegotiate}, {"signed certificate timestamps", TLSEXT_TYPE_signed_certificate_timestamp}, diff --git a/apps/s_client.c b/apps/s_client.c index cfd7cbd79d..1bcfe8e3dc 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2448,13 +2448,6 @@ int s_client_main(int argc, char **argv) SSL_renegotiate(con); cbuf_len = 0; } -#ifndef OPENSSL_NO_HEARTBEATS - else if ((!c_ign_eof) && (cbuf[0] == 'B' && cmdletters)) { - BIO_printf(bio_err, "HEARTBEATING\n"); - SSL_heartbeat(con); - cbuf_len = 0; - } -#endif else { cbuf_len = i; cbuf_off = 0; diff --git a/apps/s_server.c b/apps/s_server.c index ee6631809c..88cbf9f8c1 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2226,14 +2226,6 @@ static int sv_body(int s, int stype, 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); |