Skip to content

Commit 2fdac57

Browse files
committed
Remove linuxkm-pie dependency for FIPS linuxkm
1 parent 9a3ea6f commit 2fdac57

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

configure.ac

-3
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,6 @@ AC_ARG_ENABLE([linuxkm-pie],
659659
if test "$ENABLED_LINUXKM_PIE" = "yes"
660660
then
661661
AM_CFLAGS="$AM_CFLAGS -DHAVE_LINUXKM_PIE_SUPPORT"
662-
elif test "$ENABLED_FIPS" = yes && test "$ENABLED_LINUXKM" = yes
663-
then
664-
AC_MSG_ERROR([FIPS linuxkm requires linuxkm-pie.])
665662
fi
666663
AC_SUBST([ENABLED_LINUXKM_PIE])
667664

linuxkm/linuxkm_wc_port.h

-4
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,6 @@
497497
#error "compiling -fPIE requires PIE redirect table."
498498
#endif
499499

500-
#if defined(HAVE_FIPS) && !defined(HAVE_LINUXKM_PIE_SUPPORT)
501-
#error "FIPS build requires PIE support."
502-
#endif
503-
504500
#ifdef USE_WOLFSSL_LINUXKM_PIE_REDIRECT_TABLE
505501

506502
#ifdef CONFIG_MIPS

linuxkm/module_hooks.c

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
#ifndef NO_CRYPT_TEST
4949
#include <wolfcrypt/test/test.h>
5050
#endif
51+
#include <wolfssl/wolfcrypt/random.h>
52+
#include <wolfssl/wolfcrypt/sha256.h>
5153

5254
static int libwolfssl_cleanup(void) {
5355
int ret;

wolfssl/wolfcrypt/settings.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -3617,8 +3617,12 @@ extern void uITRON4_free(void *p) ;
36173617
#undef WOLFSSL_HAVE_MAX
36183618
#undef WOLFSSL_HAVE_ASSERT_H
36193619
#define WOLFSSL_NO_ASSERT_H
3620-
#define SIZEOF_LONG 8
3621-
#define SIZEOF_LONG_LONG 8
3620+
#ifndef SIZEOF_LONG
3621+
#define SIZEOF_LONG 8
3622+
#endif
3623+
#ifndef SIZEOF_LONG_LONG
3624+
#define SIZEOF_LONG_LONG 8
3625+
#endif
36223626
#define CHAR_BIT 8
36233627
#ifndef WOLFSSL_SP_DIV_64
36243628
#define WOLFSSL_SP_DIV_64

0 commit comments

Comments
 (0)