[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  07980622e28746245a83ad9d011b6a4a32a1c2e0 (commit)
      from  9a4fd80ee0ad1833879b6a55c9c4673eeb8446a3 (commit)


- Log -----------------------------------------------------------------
commit 07980622e28746245a83ad9d011b6a4a32a1c2e0
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 13 12:50:32 2020 +0100

    include/openssl/whrlpool.h: correct unbalanced deprecation guards
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/11087)

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

Summary of changes:
 include/openssl/whrlpool.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/openssl/whrlpool.h b/include/openssl/whrlpool.h
index d2a483c6c1..cc8802f70c 100644
--- a/include/openssl/whrlpool.h
+++ b/include/openssl/whrlpool.h
@@ -53,10 +53,8 @@ DEPRECATEDIN_3_0(int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c))
 DEPRECATEDIN_3_0(unsigned char *WHIRLPOOL(const void *inp, size_t bytes,
                                           unsigned char *md))
 
-#  if !defined(OPENSSL_NO_DEPRECATED_3_0)
-#   ifdef __cplusplus
+#  ifdef __cplusplus
 }
-#   endif
 #  endif
 # endif