Commit 558ea847 authored by Richard Levitte's avatar Richard Levitte
Browse files

Remove heartbeats completely 



Fixes #4856

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1928)
parent d88736df

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 














 Changes between 1.1.1 and 3.0.0 [xx XXX xxxx]



























  *) Removed the heartbeat message in DTLS feature, as it has very













     little usage and doesn't seem to fulfill a valuable purpose.













     [Richard Levitte]



























  *) Changed the output of 'openssl {digestname} < file' to display the















     digest name in its output.















     [Richard Levitte]

































Configure



+0
−2






























Original line number
Diff line number
Diff line








@@ -375,7 +375,6 @@ my @disablables = (













    "fuzz-libfuzzer",















    "fuzz-afl",















    "gost",













    "heartbeats",















    "idea",















    "makedepend",















    "md2",










@@ -456,7 +455,6 @@ our %disabled = ( # "what"         => "comment"













                  "external-tests"      => "default",















                  "fuzz-libfuzzer"      => "default",















                  "fuzz-afl"            => "default",













                  "heartbeats"          => "default",















                  "md2"                 => "default",















                  "msan"                => "default",















                  "rc5"                 => "default",

































NEWS



+1
−0






























Original line number
Diff line number
Diff line








@@ -13,6 +13,7 @@













        3.0.0















      o Added EVP_MAC, an EVP layer MAC API, and a generic EVP_PKEY to EVP_MAC















        bridge.













      o Removed the heartbeat message in DTLS feature.































  Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.1a [20 Nov 2018]

















































apps/openssl.c



+0
−3






























Original line number
Diff line number
Diff line








@@ -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

































apps/s_cb.c



+0
−17






























Original line number
Diff line number
Diff line








@@ -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},