From: Richard Levitte <levitte@openssl.org>
Date: Mon, 1 Apr 2019 15:37:16 +0000 (+0200)
Subject: Restore the "heartbeats" configuration option among the deprecated
X-Git-Tag: openssl-3.0.0-alpha1~2254
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=0b45d8eec051fd9816b6bf46a975fa461ffc983d

Restore the "heartbeats" configuration option among the deprecated

Removing the option entirely would break builds unnecessarily, so
let's make it deprecated.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8632)
---

diff --git a/CHANGES b/CHANGES
index 1d093142b7..28d732bcf1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@
 
   *) Removed the heartbeat message in DTLS feature, as it has very
      little usage and doesn't seem to fulfill a valuable purpose.
+     The configuration option is now deprecated.
      [Richard Levitte]
 
   *) Changed the output of 'openssl {digestname} < file' to display the
diff --git a/Configure b/Configure
index 258f99184d..df66abb738 100755
--- a/Configure
+++ b/Configure
@@ -438,6 +438,7 @@ my %deprecated_disablables = (
     "ripemd" => "rmd160",
     "ui" => "ui-console",
     "dso" => undef,
+    "heartbeats" => undef,
     );
 
 # All of the following are disabled by default: