From: Rich Salz <rsalz@akamai.com>
Date: Fri, 16 Apr 2021 21:57:30 +0000 (-0400)
Subject: Remove extra trailing semicolon
X-Git-Tag: openssl-3.0.0-alpha15~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72f649e061bef86cbf41303fede1a61c9fe2c05b;p=thirdparty%2Fopenssl.git

Remove extra trailing semicolon

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14903)
---

diff --git a/providers/common/provider_seeding.c b/providers/common/provider_seeding.c
index 73a2a141874..51e9badc825 100644
--- a/providers/common/provider_seeding.c
+++ b/providers/common/provider_seeding.c
@@ -23,7 +23,8 @@ int ossl_prov_seeding_from_dispatch(const OSSL_DISPATCH *fns)
          * multiple versions of libcrypto (e.g. one static and one dynamic), but
          * sharing a single fips.so. We do a simple sanity check here.
          */
-#define set_func(c, f) if (c == NULL) c = f; else if (c != f) return 0;
+#define set_func(c, f) \
+    do { if (c == NULL) c = f; else if (c != f) return 0; } while (0)
         switch (fns->function_id) {
         case OSSL_FUNC_GET_ENTROPY:
             set_func(c_get_entropy, OSSL_FUNC_get_entropy(fns));
@@ -38,6 +39,7 @@ int ossl_prov_seeding_from_dispatch(const OSSL_DISPATCH *fns)
             set_func(c_cleanup_nonce, OSSL_FUNC_cleanup_nonce(fns));
             break;
         }
+#undef set_func
     }
     return 1;
 }