bsdkm: review cleanup.

Author: philljj

Makefile.am

@@ -248,12 +248,6 @@ if BUILD_BSDKM
         AM_CCASFLAGS CCASFLAGS \
         src_libwolfssl_la_OBJECTS ENABLED_CRYPT_TESTS
 
-module:
-	+$(MAKE) -C bsdkm libwolfssl.ko
-
-clean_module:
-	+$(MAKE) -C bsdkm clean
-
 endif
 
 

bsdkm/Makefile

@@ -3,25 +3,20 @@ KMOD=libwolfssl
 SRCS=wolfkmod.c
 WOLFSSL_DIR=../
 
-CFLAGS+=-I/usr/include/sys
 CFLAGS+=-I${WOLFSSL_DIR}
 CFLAGS+=-DWOLFSSL_IGNORE_FILE_WARN -DHAVE_CONFIG_H
 CFLAGS+=-DNO_MAIN_DRIVER
 # debug mode
 CFLAGS+=-DWOLFSSL_BSDKM_VERBOSE_DEBUG
 CFLAGS+=$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
 
-# FreeBSD make does not support GNU make's patsubst and related.
-# Just include everything under wolfcrypt/src/ except port, and let
-# define flags filter the rest.
-OBJS != find ${WOLFSSL_DIR}/wolfcrypt/src -path \
-  '${WOLFSSL_DIR}/wolfcrypt/src/port' -prune -o -name \
-  '*.c' -print | sed 's,\.c$$,.o,'
+# FreeBSD make does not support GNU make's patsubst and related. Filter
+# through sed instead.
+OBJS != echo ${src_libwolfssl_la_OBJECTS} | sed 's|src_libwolfssl_la-||g' | \
+  sed 's|\.lo|.o|g' | sed 's|wolfcrypt/src/|${WOLFSSL_DIR}/wolfcrypt/src/|g'
 
 .if ${ENABLED_CRYPT_TESTS} == "yes"
     OBJS += ${WOLFSSL_DIR}/wolfcrypt/test/test.o
-    # freebsd kernel compiler insists fiducial line vars are unused.
-    CFLAGS+=-Wno-error=unused-const-variable
 .else
     CFLAGS+=-DNO_CRYPT_TEST
 .endif
@@ -42,7 +37,10 @@ OBJS != find ${WOLFSSL_DIR}/wolfcrypt/src -path \
 .endif
 .include "${SYSDIR}/conf/kmod.mk"
 
-# Suppress wolfcrypt/src/misc.c drops const qualifier, and similar.
+# Smooth out a few inconsistencies between FreeBSD default compiler flags
+# in /usr/src/sys/conf/kern.mk, vs wolfssl harden flags in
+# m4/ax_harden_compiler_flags.m4. E.g. some FreeBSD header files shorten
+# 64 to 32 bit, and some wolfcrypt functions cast away const.
 CFLAGS+= -Wno-unused-function
 CFLAGS+= -Wno-cast-qual
 CFLAGS+= -Wno-error=cast-qual

bsdkm/bsdkm_wc_port.h

@@ -105,7 +105,6 @@ extern struct malloc_type M_WOLFSSL[1];
 #endif /* !SINGLE_THREADED */
 
 #if defined(WOLFSSL_HAVE_ATOMIC_H) && !defined(WOLFSSL_NO_ATOMICS)
-    /* todo: add FreeBSD implementation in wc_port.c */
     #include <machine/atomic.h>
     typedef volatile int wolfSSL_Atomic_Int;
     typedef volatile unsigned int wolfSSL_Atomic_Uint;

wolfcrypt/test/test.c

@@ -10439,9 +10439,8 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t des3_test(void)
 }
 #endif /* NO_DES3 */
 
-static const int fiducial1 = WC_TEST_RET_LN; /* source code reference point --
-                                              * see print_fiducials() below.
-                                              */
+ /* source code reference point -- see print_fiducials() below. */
+static WC_MAYBE_UNUSED const int fiducial1 = WC_TEST_RET_LN;
 
 #ifndef NO_AES
 
@@ -30100,9 +30099,8 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t tls13_kdf_test(void)
 
 #endif /* WOLFSSL_TLS13 && !NO_HMAC */
 
-static const int fiducial2 = WC_TEST_RET_LN; /* source code reference point --
-                                              * see print_fiducials() below.
-                                              */
+ /* source code reference point -- see print_fiducials() below. */
+static WC_MAYBE_UNUSED const int fiducial2 = WC_TEST_RET_LN;
 
 #if defined(HAVE_ECC) && defined(HAVE_X963_KDF)
 
@@ -49880,9 +49878,8 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t lms_test_verify_only(void)
 #endif
 #endif /* if defined(WOLFSSL_HAVE_LMS) && !defined(WOLFSSL_SMALL_STACK) */
 
-static const int fiducial3 = WC_TEST_RET_LN; /* source code reference point --
-                                              * see print_fiducials() below.
-                                              */
+ /* source code reference point -- see print_fiducials() below. */
+static WC_MAYBE_UNUSED const int fiducial3 = WC_TEST_RET_LN;
 
 #ifdef WOLFCRYPT_HAVE_ECCSI
 static wc_test_ret_t eccsi_api_test(WC_RNG* rng, EccsiKey* key, mp_int* ssk,
@@ -62831,7 +62828,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t aes_siv_test(void)
 
 #undef ERROR_OUT
 
-static const int fiducial4 = WC_TEST_RET_LN;
+static WC_MAYBE_UNUSED const int fiducial4 = WC_TEST_RET_LN;
 
 /* print the fiducial line numbers assigned above, allowing confirmation of
  * source code version match when in doubt.

wolfssl/wolfcrypt/types.h

@@ -725,7 +725,7 @@ enum {
 
 #elif defined(WOLFSSL_LINUXKM)
 
-    /* definitions are in linuxkm/linuxkm_wc_port.h. */
+    /* definitions are in linuxkm/linuxkm_wc_port.h */
 
 #elif defined(WOLFSSL_BSDKM)