Skip to content

linuxkm: add PQ in-core sanity markers to the PIE redirect table #11443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaleb-himes wants to merge 1 commit into
base: master
Choose a base branch
from
+73 −0
Open

linuxkm: add PQ in-core sanity markers to the PIE redirect table #11443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions linuxkm/linuxkm_wc_port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,27 @@
extern int wolfCrypt_FIPS_SHA3_sanity(void);
extern const unsigned int wolfCrypt_FIPS_sha3_ro_sanity[2];
#endif
/* PQ boundary members added in v7.0.0; see fips_test.c DoInCoreCheck. */
#if defined(WOLFSSL_HAVE_MLKEM) && FIPS_VERSION3_GE(7,0,0)
extern int wolfCrypt_FIPS_MLKEM_sanity(void);
extern const unsigned int wolfCrypt_FIPS_mlkem_ro_sanity[2];
#endif
#if defined(WOLFSSL_HAVE_MLDSA) && FIPS_VERSION3_GE(7,0,0)
extern int wolfCrypt_FIPS_MLDSA_sanity(void);
extern const unsigned int wolfCrypt_FIPS_mldsa_ro_sanity[2];
#endif
#if defined(WOLFSSL_HAVE_SLHDSA) && FIPS_VERSION3_GE(7,0,0)
extern int wolfCrypt_FIPS_SLHDSA_sanity(void);
extern const unsigned int wolfCrypt_FIPS_slhdsa_ro_sanity[2];
#endif
#if defined(WOLFSSL_HAVE_LMS) && FIPS_VERSION3_GE(7,0,0)
extern int wolfCrypt_FIPS_LMS_sanity(void);
extern const unsigned int wolfCrypt_FIPS_lms_ro_sanity[2];
#endif
#if defined(WOLFSSL_HAVE_XMSS) && FIPS_VERSION3_GE(7,0,0)
extern int wolfCrypt_FIPS_XMSS_sanity(void);
extern const unsigned int wolfCrypt_FIPS_xmss_ro_sanity[2];
#endif
#ifndef WOLFSSL_FIPS_DEV_NO_POST
extern int wolfCrypt_FIPS_FT_sanity(void);
extern const unsigned int wolfCrypt_FIPS_ft_ro_sanity[2];
Expand Down Expand Up @@ -1445,6 +1466,27 @@
typeof(wolfCrypt_FIPS_SHA3_sanity) *wolfCrypt_FIPS_SHA3_sanity;
typeof(wolfCrypt_FIPS_sha3_ro_sanity) *wolfCrypt_FIPS_sha3_ro_sanity;
#endif
/* PQ boundary members added in v7.0.0; see fips_test.c DoInCoreCheck. */
#if defined(WOLFSSL_HAVE_MLKEM) && FIPS_VERSION3_GE(7,0,0)
typeof(wolfCrypt_FIPS_MLKEM_sanity) *wolfCrypt_FIPS_MLKEM_sanity;
typeof(wolfCrypt_FIPS_mlkem_ro_sanity) *wolfCrypt_FIPS_mlkem_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_MLDSA) && FIPS_VERSION3_GE(7,0,0)
typeof(wolfCrypt_FIPS_MLDSA_sanity) *wolfCrypt_FIPS_MLDSA_sanity;
typeof(wolfCrypt_FIPS_mldsa_ro_sanity) *wolfCrypt_FIPS_mldsa_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_SLHDSA) && FIPS_VERSION3_GE(7,0,0)
typeof(wolfCrypt_FIPS_SLHDSA_sanity) *wolfCrypt_FIPS_SLHDSA_sanity;
typeof(wolfCrypt_FIPS_slhdsa_ro_sanity) *wolfCrypt_FIPS_slhdsa_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_LMS) && FIPS_VERSION3_GE(7,0,0)
typeof(wolfCrypt_FIPS_LMS_sanity) *wolfCrypt_FIPS_LMS_sanity;
typeof(wolfCrypt_FIPS_lms_ro_sanity) *wolfCrypt_FIPS_lms_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_XMSS) && FIPS_VERSION3_GE(7,0,0)
typeof(wolfCrypt_FIPS_XMSS_sanity) *wolfCrypt_FIPS_XMSS_sanity;
typeof(wolfCrypt_FIPS_xmss_ro_sanity) *wolfCrypt_FIPS_xmss_ro_sanity;
#endif
#ifndef WOLFSSL_FIPS_DEV_NO_POST
typeof(wolfCrypt_FIPS_FT_sanity) *wolfCrypt_FIPS_FT_sanity;
typeof(wolfCrypt_FIPS_ft_ro_sanity) *wolfCrypt_FIPS_ft_ro_sanity;
Expand Down
31 changes: 31 additions & 0 deletions linuxkm/module_hooks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1981,6 +1981,37 @@ static int set_up_wolfssl_linuxkm_pie_redirect_table(void) {
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_sha3_ro_sanity =
&wolfCrypt_FIPS_sha3_ro_sanity;
#endif
/* PQ boundary members added in v7.0.0; see fips_test.c DoInCoreCheck. */
#if defined(WOLFSSL_HAVE_MLKEM) && FIPS_VERSION3_GE(7,0,0)
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_MLKEM_sanity =
wolfCrypt_FIPS_MLKEM_sanity;
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_mlkem_ro_sanity =
&wolfCrypt_FIPS_mlkem_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_MLDSA) && FIPS_VERSION3_GE(7,0,0)
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_MLDSA_sanity =
wolfCrypt_FIPS_MLDSA_sanity;
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_mldsa_ro_sanity =
&wolfCrypt_FIPS_mldsa_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_SLHDSA) && FIPS_VERSION3_GE(7,0,0)
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_SLHDSA_sanity =
wolfCrypt_FIPS_SLHDSA_sanity;
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_slhdsa_ro_sanity =
&wolfCrypt_FIPS_slhdsa_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_LMS) && FIPS_VERSION3_GE(7,0,0)
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_LMS_sanity =
wolfCrypt_FIPS_LMS_sanity;
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_lms_ro_sanity =
&wolfCrypt_FIPS_lms_ro_sanity;
#endif
#if defined(WOLFSSL_HAVE_XMSS) && FIPS_VERSION3_GE(7,0,0)
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_XMSS_sanity =
wolfCrypt_FIPS_XMSS_sanity;
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_xmss_ro_sanity =
&wolfCrypt_FIPS_xmss_ro_sanity;
#endif

#ifndef WOLFSSL_FIPS_DEV_NO_POST
wolfssl_linuxkm_pie_redirect_table.wolfCrypt_FIPS_FT_sanity =
Expand Down
Loading