wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

linuxkm/module_hooks.c: in wolfssl_init(), #ifdef HAVE_FIPS, wc_RunAllCast_fips();

Browse Source 
wolfcrypt/src/aes.c: add missing parens in GHASH_ONE_BLOCK_SW() to mollify clang-tidy;

wolfssl/wolfcrypt/fips_test.h: add FIPS_CAST_AES_ECB;

wolfssl/wolfcrypt/settings.h: #ifdef WOLFSSL_LINUXKM, #undef HAVE_LIMITS_H.
This commit is contained in:
Daniel Pouzzner
2025-01-24 14:29:05 -06:00
parent 09ac8c69db
commit 93ac482772
4 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
linuxkm/module_hooks.c
View File

@ -244,6 +244,38 @@ static int wolfssl_init(void)
} }
return -ECANCELED; return -ECANCELED;
} }
#endif /* HAVE_FIPS */
#ifdef WC_RNG_SEED_CB
ret = wc_SetSeed_Cb(wc_GenerateSeed);
if (ret < 0) {
pr_err("wc_SetSeed_Cb() failed with return code %d.\n", ret);
(void)libwolfssl_cleanup();
msleep(10);
return -ECANCELED;
}
#endif
#ifdef WOLFCRYPT_ONLY
ret = wolfCrypt_Init();
if (ret != 0) {
pr_err("wolfCrypt_Init() failed: %s\n", wc_GetErrorString(ret));
return -ECANCELED;
}
#else
ret = wolfSSL_Init();
if (ret != WOLFSSL_SUCCESS) {
pr_err("wolfSSL_Init() failed: %s\n", wc_GetErrorString(ret));
return -ECANCELED;
}
#endif
#ifdef HAVE_FIPS
ret = wc_RunAllCast_fips();
if (ret != 0) {
pr_err("wc_RunAllCast_fips() failed with return value %d\n", ret);
return -ECANCELED;
}
pr_info("FIPS 140-3 wolfCrypt-fips v%d.%d.%d%s%s startup " pr_info("FIPS 140-3 wolfCrypt-fips v%d.%d.%d%s%s startup "
"self-test succeeded.\n", "self-test succeeded.\n",
@ -270,33 +302,8 @@ static int wolfssl_init(void)
"" ""
#endif #endif
); );
#endif /* HAVE_FIPS */ #endif /* HAVE_FIPS */
#ifdef WC_RNG_SEED_CB
ret = wc_SetSeed_Cb(wc_GenerateSeed);
if (ret < 0) {
pr_err("wc_SetSeed_Cb() failed with return code %d.\n", ret);
(void)libwolfssl_cleanup();
msleep(10);
return -ECANCELED;
}
#endif
#ifdef WOLFCRYPT_ONLY
ret = wolfCrypt_Init();
if (ret != 0) {
pr_err("wolfCrypt_Init() failed: %s\n", wc_GetErrorString(ret));
return -ECANCELED;
}
#else
ret = wolfSSL_Init();
if (ret != WOLFSSL_SUCCESS) {
pr_err("wolfSSL_Init() failed: %s\n", wc_GetErrorString(ret));
return -ECANCELED;
}
#endif
#ifndef NO_CRYPT_TEST #ifndef NO_CRYPT_TEST
ret = wolfcrypt_test(NULL); ret = wolfcrypt_test(NULL);
if (ret < 0) { if (ret < 0) {

2
wolfcrypt/src/aes.c
View File

@ -6886,7 +6886,7 @@ void GHASH(Gcm* gcm, const byte* a, word32 aSz, const byte* c,
#define GHASH_ONE_BLOCK_SW(aes, block) \ #define GHASH_ONE_BLOCK_SW(aes, block) \
do { \ do { \
xorbuf(AES_TAG(aes), block, WC_AES_BLOCK_SIZE); \ xorbuf(AES_TAG(aes), block, WC_AES_BLOCK_SIZE); \
GMULT(AES_TAG(aes), aes->gcm.H); \ GMULT(AES_TAG(aes), (aes)->gcm.H); \
} \ } \
while (0) while (0)
#endif /* WOLFSSL_AESGCM_STREAM */ #endif /* WOLFSSL_AESGCM_STREAM */

4
wolfssl/wolfcrypt/fips_test.h
View File

@ -72,7 +72,9 @@ enum FipsCastId {
FIPS_CAST_ED25519 = 16, FIPS_CAST_ED25519 = 16,
FIPS_CAST_ED448 = 17, FIPS_CAST_ED448 = 17,
FIPS_CAST_PBKDF2 = 18, FIPS_CAST_PBKDF2 = 18,
FIPS_CAST_COUNT = 19 /* v7.0.0 + */
FIPS_CAST_AES_ECB = 19,
FIPS_CAST_COUNT = 20
}; };
enum FipsCastStateId { enum FipsCastStateId {

3
wolfssl/wolfcrypt/settings.h
View File

@ -3599,7 +3599,10 @@ extern void uITRON4_free(void *p) ;
#define WOLFSSL_TEST_SUBROUTINE static #define WOLFSSL_TEST_SUBROUTINE static
#endif #endif
#undef HAVE_PTHREAD #undef HAVE_PTHREAD
/* linuxkm uses linux/string.h, included by linuxkm_wc_port.h. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* linuxkm uses linux/limits.h, included by linuxkm_wc_port.h. */
#undef HAVE_LIMITS_H
#undef HAVE_ERRNO_H #undef HAVE_ERRNO_H
#undef HAVE_THREAD_LS #undef HAVE_THREAD_LS
#undef HAVE_ATEXIT #undef HAVE_ATEXIT