diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:53:33 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:53:33 +0100 |
| commit | b612799a80af398040efc2416e0d09dcb0da1cf5 (patch) | |
| tree | fdc1238fdb3b4c6b642373b068708af7beea2ba1 /apps/s_cb.c | |
| parent | 6c62f9e1639a7d1a879f363a99882920104dfedb (diff) | |
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>
Diffstat (limited to 'apps/s_cb.c')
| -rw-r--r-- | apps/s_cb.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c index a2e8cbc8e2..d5c308ee13 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -555,6 +555,22 @@ 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 } } @@ -595,6 +611,7 @@ 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}, |