[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0b45d8eec051fd9816b6bf46a975fa461ffc983d (commit)
      from  9058d9bcd0a0391353720f7728a48596b575ad64 (commit)


- Log -----------------------------------------------------------------
commit 0b45d8eec051fd9816b6bf46a975fa461ffc983d
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 1 17:37:16 2019 +0200

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8632)

-----------------------------------------------------------------------

Summary of changes:
 CHANGES   | 1 +
 Configure | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 1d09314..28d732b 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 258f991..df66abb 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: