From 3ac985c2f1461bcc8c4c64ef41c6e0b4ec0d3001 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 7 Sep 2022 11:34:27 -0600 Subject: [PATCH] Proposed changes based on customer report(s) under consideration by the team --- configure.ac | 2 +- m4/ax_harden_compiler_flags.m4 | 4 ++-- wolfssl/wolfcrypt/settings.h | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b1ea55171..4642ef434 100644 --- a/configure.ac +++ b/configure.ac @@ -975,7 +975,7 @@ AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[ # If AX_PTHREAD is adding -Qunused-arguments, need to prepend with -Xcompiler libtool will use it. Newer # versions of clang don't need the -Q flag when using pthreads. AS_CASE([$PTHREAD_CFLAGS],[-Qunused-arguments*],[PTHREAD_CFLAGS="-Xcompiler $PTHREAD_CFLAGS"]) - AM_CFLAGS="$AM_CFLAGS -D_POSIX_THREADS $PTHREAD_CFLAGS" + AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" LIBS="$LIBS $PTHREAD_LIBS" ],[ ENABLED_SINGLETHREADED=yes diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4 index dce668551..d9ae175c0 100644 --- a/m4/ax_harden_compiler_flags.m4 +++ b/m4/ax_harden_compiler_flags.m4 @@ -144,7 +144,7 @@ AX_APPEND_COMPILE_FLAGS([-Woverride-init],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],,[$ax_append_compile_cflags_extra]) - AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cflags_extra]) +dnl AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cflags_extra]) @@ -206,7 +206,7 @@ AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],,[$ax_append_compile_cxxflags_extra]) AX_APPEND_COMPILE_FLAGS([-Woverloaded-virtual],,[$ax_append_compile_cxxflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_cxxflags_extra]) - AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cxxflags_extra]) +dnl AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cxxflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cxxflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cxxflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cxxflags_extra]) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index e23cd433b..2a92b9178 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2637,6 +2637,13 @@ extern void uITRON4_free(void *p) ; #undef WOLFSSL_TLS13 #endif +/* FIPS v2 does not support WOLFSSL_PSS_LONG_SALT */ +#if FIPS_VERSION_EQ(2,0) + #ifdef WOLFSSL_PSS_LONG_SALT + #undef WOLFSSL_PSS_LONG_SALT + #endif +#endif + /* For FIPSv2 make sure the ECDSA encoding allows extra bytes * but make sure users consider enabling it */ #if !defined(NO_STRICT_ECDSA_LEN) && FIPS_VERSION_GE(2,0)