diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:55:40 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-29 13:50:59 +0100 |
| commit | 558ea84743918f7a93bfbfc259f86ad1fa4c8de9 (patch) | |
| tree | 16690b411af8e6456852f57d41b0aff86a4ecf16 /apps | |
| parent | d88736df4d19521664ebb125ff66e0d7b085a53c (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')
| -rw-r--r-- | apps/openssl.c | 3 | ||||
| -rw-r--r-- | apps/s_cb.c | 17 | ||||
| -rw-r--r-- | apps/s_client.c | 10 | ||||
| -rw-r--r-- | apps/s_server.c | 8 |
4 files changed, 1 insertions, 37 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 6bb27853fe..b5ec835d51 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -923,9 +923,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 818266c814..935ea9022d 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -600,22 +600,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 } } @@ -656,7 +640,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 7a41d831e9..6d7a83f3a9 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -3111,15 +3111,7 @@ int s_client_main(int argc, char **argv) cbuf[0] == 'K' ? SSL_KEY_UPDATE_REQUESTED : SSL_KEY_UPDATE_NOT_REQUESTED); 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 { + } else { cbuf_len = i; cbuf_off = 0; #ifdef CHARSET_EBCDIC 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); |