[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  e7869ef137491213753166edd23f7ba33fb34446 (commit)
      from  0c4444121cfe21e70ecf12580c4f9f5423c43905 (commit)


- Log -----------------------------------------------------------------
commit e7869ef137491213753166edd23f7ba33fb34446
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Wed Jul 1 14:47:15 2020 +1000

    Fix up build issue when running cpp tests
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12334)

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

Summary of changes:
 include/openssl/fipskey.h.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/openssl/fipskey.h.in b/include/openssl/fipskey.h.in
index 2b7568c284..eaa1798772 100644
--- a/include/openssl/fipskey.h.in
+++ b/include/openssl/fipskey.h.in
@@ -27,4 +27,8 @@ extern "C" {
  */
 #define FIPS_KEY_STRING "{- $config{FIPSKEY} -}"
 
+# ifdef  __cplusplus
+}
+# endif
+
 #endif