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 1d093142b7282407538992c75f1d8b1936d5989a..28d732bcf15868f7a3fb8e6793c3b96853fdcc82 100644 (file)
--- 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 258f99184d3ac98aab71dfd221cff90899eca46d..df66abb7386718b65e1db08ce83aaf3841278af4 100755 (executable)
--- 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: