bsdkm: rename with-bsd-source to with-kernel-source, and cleanup.

Author: philljj

Makefile.am

@@ -242,16 +242,11 @@ if BUILD_BSDKM
     DIST_SUBDIRS_OPT += bsdkm
 
 .MAKE.EXPORTED = build_triplet host_triplet CC AS LD \
-        BSDKM_ROOT BSDKM_EXPORT_SYMS KERNEL_EXTRA_CFLAGS \
+        KERNEL_ROOT BSDKM_EXPORT_SYMS KERNEL_EXTRA_CFLAGS \
         EXTRA_CFLAGS EXTRA_CPPFLAGS EXTRA_CCASFLAGS EXTRA_LDFLAGS \
 	AM_CPPFLAGS CPPFLAGS AM_CFLAGS CFLAGS \
         AM_CCASFLAGS CCASFLAGS \
-        src_libwolfssl_la_OBJECTS ENABLED_CRYPT_TESTS \
-        ENABLED_BSDKM_PIE ENABLED_ASM \
-        CFLAGS_FPU_DISABLE CFLAGS_FPU_ENABLE CFLAGS_SIMD_DISABLE CFLAGS_SIMD_ENABLE \
-        CFLAGS_AUTO_VECTORIZE_DISABLE CFLAGS_AUTO_VECTORIZE_ENABLE \
-        ASFLAGS_FPU_DISABLE_SIMD_ENABLE ASFLAGS_FPU_ENABLE_SIMD_DISABLE \
-        ASFLAGS_FPUSIMD_DISABLE ASFLAGS_FPUSIMD_ENABLE
+        src_libwolfssl_la_OBJECTS ENABLED_CRYPT_TESTS
 
 module:
 	+$(MAKE) -C bsdkm libwolfssl.ko

bsdkm/Makefile

@@ -35,10 +35,10 @@ OBJS != find ${WOLFSSL_DIR}/wolfcrypt/src -path \
 
 # Default to live kernel src tree makefile at
 # /usr/src/sys/conf/kmod.mk
-.if !defined(BSDKM_ROOT)
+.if !defined(KERNEL_ROOT)
     SYSDIR?= /usr/src/sys
 .else
-    SYSDIR?= ${BSDKM_ROOT}
+    SYSDIR?= ${KERNEL_ROOT}
 .endif
 .include "${SYSDIR}/conf/kmod.mk"
 

configure.ac

@@ -791,12 +791,14 @@ then
 fi
 
 #
-# FreeBSD
-AC_ARG_WITH([bsd-source],
-    [AS_HELP_STRING([--with-bsd-source=PATH],[PATH to root of FreeBSD kernel build tree])],
-    [BSDKM_ROOT=$withval],
-    [BSDKM_ROOT=""])
+# Kernel
+AC_ARG_WITH([kernel-source],
+    [AS_HELP_STRING([--with-kernel-source=PATH],[PATH to root of kernel build tree])],
+    [KERNEL_ROOT=$withval],
+    [KERNEL_ROOT=""])
 
+#
+# FreeBSD
 AC_ARG_WITH([bsd-export-syms],
     [AS_HELP_STRING([--with-bsd-export-syms=LIST],[LIST of symbols to export])],
     [BSDKM_EXPORT_SYMS=$withval],
@@ -818,11 +820,11 @@ then
     AM_CFLAGS="$AM_CFLAGS -DXMALLOC_OVERRIDE -DWOLFCRYPT_ONLY"
     AM_CFLAGS="$AM_CFLAGS -DNO_ASN_TIME"
 
-    if test "$BSDKM_ROOT" = ""; then
+    if test "$KERNEL_ROOT" = ""; then
         AC_PATH_DEFAULT_BSDKM_SOURCE
-        BSDKM_ROOT="$DEFAULT_BSDKM_ROOT"
+        KERNEL_ROOT="$DEFAULT_BSDKM_ROOT"
     fi
-    AC_SUBST([BSDKM_ROOT])
+    AC_SUBST([KERNEL_ROOT])
     AC_SUBST([BSDKM_EXPORT_SYMS])
 
 fi
@@ -11383,7 +11385,7 @@ echo "   * SIMD+FPU enable as flags:   $ASFLAGS_FPUSIMD_ENABLE" && \
 echo "   * Linux kernel module PIE:    $ENABLED_LINUXKM_PIE"
 
 test "$ENABLED_BSDKM" = "yes" && \
-echo "   * FreeBSD Kernel Build Root:  $BSDKM_ROOT"
+echo "   * FreeBSD Kernel Build Root:  $KERNEL_ROOT"
 
 echo "   * Debug enabled:              $ax_enable_debug"
 echo "   * Coverage enabled:           $ax_enable_coverage"

wolfssl/wolfcrypt/settings.h

@@ -3926,8 +3926,13 @@ extern void uITRON4_free(void *p) ;
     #ifndef NO_OLD_SSL_NAMES
         #define NO_OLD_SSL_NAMES
     #endif
-    #undef WOLFSSL_MIN_AUTH_TAG_SZ
-    #define WOLFSSL_MIN_AUTH_TAG_SZ 4
+
+    /* FreeBSD kernel defines its own min, max functions in sys/libkern.h */
+    #undef  WOLFSSL_HAVE_MIN
+    #define WOLFSSL_HAVE_MIN
+
+    #undef  WOLFSSL_HAVE_MAX
+    #define WOLFSSL_HAVE_MAX
 #endif
 
 /* Place any other flags or defines here */

wolfssl/wolfcrypt/wc_port.h

@@ -1304,15 +1304,6 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
     #endif /* max */
 #endif /* USE_WINDOWS_API */
 
-#if defined(WOLFSSL_BSDKM)
-    /* FreeBSD kernel defines its own min, max functions in sys/libkern.h */
-    #undef  WOLFSSL_HAVE_MIN
-    #define WOLFSSL_HAVE_MIN
-
-    #undef  WOLFSSL_HAVE_MAX
-    #define WOLFSSL_HAVE_MAX
-#endif /* WOLFSSL_BSDKM */
-
 #ifdef __QNXNTO__
     #define WOLFSSL_HAVE_MIN
     #define WOLFSSL_HAVE_MAX