The branch master has been updated
via 72f649e061bef86cbf41303fede1a61c9fe2c05b (commit)
from cd0aca532091de4dfadf2f12b18dd99e9cba7615 (commit)
- Log -----------------------------------------------------------------
commit 72f649e061bef86cbf41303fede1a61c9fe2c05b
Author: Rich Salz <[email protected]>
Date: Fri Apr 16 17:57:30 2021 -0400
Remove extra trailing semicolon
Reviewed-by: Matthias St. Pierre <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/14903)
-----------------------------------------------------------------------
Summary of changes:
providers/common/provider_seeding.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/providers/common/provider_seeding.c
b/providers/common/provider_seeding.c
index 73a2a14187..51e9badc82 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;
}
