Skip to content

Commit b3e29fb

Browse files
authored
Merge pull request #242 from BridgerVoss/bug_fix
fixes legacy FIPS wolfProvider support commit
2 parents 5f94600 + 325fe35 commit b3e29fb

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

src/wp_digests.c

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -220,25 +220,22 @@ const OSSL_DISPATCH name##_functions[] = { \
220220
{ 0, NULL } \
221221
};
222222

223-
#if defined(HAVE_FIPS) && !defined(WP_ALLOW_NON_FIPS)
224223
#define IMPLEMENT_DIGEST_NULL(name) \
225-
/** Dispatch table for digest algorithms. */ \
224+
/** Dispatch table for digest_null algorithms. */ \
225+
static int name##_digest_null(void) { return 0; } \
226+
static void name##_digest_void(void) {} \
226227
const OSSL_DISPATCH name##_functions[] = { \
227-
{ OSSL_FUNC_DIGEST_NEWCTX, (DFUNC)wp_digest_null }, \
228-
{ OSSL_FUNC_DIGEST_INIT, (DFUNC)wp_digest_null }, \
229-
{ OSSL_FUNC_DIGEST_UPDATE, (DFUNC)wp_digest_null }, \
230-
{ OSSL_FUNC_DIGEST_FINAL, (DFUNC)wp_digest_null }, \
231-
{ OSSL_FUNC_DIGEST_FREECTX, (DFUNC)wp_digest_void }, \
232-
{ OSSL_FUNC_DIGEST_DUPCTX, (DFUNC)wp_digest_null }, \
233-
{ OSSL_FUNC_DIGEST_GET_PARAMS, (DFUNC)wp_digest_null }, \
234-
{ OSSL_FUNC_DIGEST_GETTABLE_PARAMS, (DFUNC)wp_digest_null }, \
228+
{ OSSL_FUNC_DIGEST_NEWCTX, (DFUNC)name##_digest_null }, \
229+
{ OSSL_FUNC_DIGEST_INIT, (DFUNC)name##_digest_null }, \
230+
{ OSSL_FUNC_DIGEST_UPDATE, (DFUNC)name##_digest_null }, \
231+
{ OSSL_FUNC_DIGEST_FINAL, (DFUNC)name##_digest_null }, \
232+
{ OSSL_FUNC_DIGEST_FREECTX, (DFUNC)name##_digest_void }, \
233+
{ OSSL_FUNC_DIGEST_DUPCTX, (DFUNC)name##_digest_null }, \
234+
{ OSSL_FUNC_DIGEST_GET_PARAMS, (DFUNC)name##_digest_null }, \
235+
{ OSSL_FUNC_DIGEST_GETTABLE_PARAMS, (DFUNC)name##_digest_null }, \
235236
{ 0, NULL } \
236237
};
237238

238-
static int wp_digest_null(void) { return 0; }
239-
static void wp_digest_void(void) {}
240-
#endif
241-
242239
/**
243240
* Get parameters of a digest algorithm.
244241
*

0 commit comments

Comments
 (0)