[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  1bfd20f08c042072cae44a9eb81626cbfff81116 (commit)
      from  e1cd94f2dca4056ce042c62b89c468dffc088033 (commit)


- Log -----------------------------------------------------------------
commit 1bfd20f08c042072cae44a9eb81626cbfff81116
Author: Pauli <pauli at openssl.org>
Date:   Fri Jan 21 17:09:46 2022 +1100

    self_test.h: fix the C++ wrapping
    
    Fixes #17557
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17562)

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

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

diff --git a/include/openssl/self_test.h b/include/openssl/self_test.h
index 77c600a0d1..6d6c96abf8 100644
--- a/include/openssl/self_test.h
+++ b/include/openssl/self_test.h
@@ -73,10 +73,6 @@ extern "C" {
 # define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND   "TLS13_KDF_EXPAND"
 # define OSSL_SELF_TEST_DESC_RNG            "RNG"
 
-# ifdef __cplusplus
-}
-# endif
-
 void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
                                  void *cbarg);
 void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
@@ -90,4 +86,7 @@ void OSSL_SELF_TEST_onbegin(OSSL_SELF_TEST *st, const char *type,
 int OSSL_SELF_TEST_oncorrupt_byte(OSSL_SELF_TEST *st, unsigned char *bytes);
 void OSSL_SELF_TEST_onend(OSSL_SELF_TEST *st, int ret);
 
+# ifdef __cplusplus
+}
+# endif
 #endif /* OPENSSL_SELF_TEST_H */