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/s_cb.c | |
| 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/s_cb.c')
| -rw-r--r-- | apps/s_cb.c | 17 |
1 files changed, 0 insertions, 17 deletions
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}, |