From: Pauli <paul.dale@oracle.com>
Date: Thu, 11 Jun 2020 22:48:06 +0000 (+1000)
Subject: Guard new header mac.h against C++isms.
X-Git-Tag: openssl-3.0.0-alpha4~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffb6c86663f8d1048b8bac4023c0e41d3ec5891d;p=thirdparty%2Fopenssl.git

Guard new header mac.h against C++isms.

[extended tests]

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/12121)
---

diff --git a/include/openssl/mac.h b/include/openssl/mac.h
index 4fb808525f7..ecfb2eca27b 100644
--- a/include/openssl/mac.h
+++ b/include/openssl/mac.h
@@ -17,6 +17,10 @@
 # include <openssl/types.h>
 # include <openssl/core.h>
 
+# ifdef __cplusplus
+extern "C" {
+# endif
+
 EVP_MAC *EVP_MAC_fetch(OPENSSL_CTX *libctx, const char *algorithm,
                        const char *properties);
 int EVP_MAC_up_ref(EVP_MAC *mac);
@@ -49,4 +53,7 @@ void EVP_MAC_names_do_all(const EVP_MAC *mac,
                           void (*fn)(const char *name, void *data),
                           void *data);
 
+# ifdef __cplusplus
+}
+# endif
 #endif /* OPENSSL_EVP_MAC_H */