feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Clean up compile errors

Browse Source
This commit is contained in:
Andras Fekete
2023-08-01 13:40:52 -04:00
parent 6e33fe3b51
commit 25f542adb4
6 changed files with 3 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -30,8 +30,6 @@ done
for file in \
./wolfssl/options.h \
./ctaocrypt/src/fips.c \
./ctaocrypt/src/fips_test.c \
./wolfcrypt/src/fips.c \
./wolfcrypt/src/fips_test.c \
./wolfcrypt/src/wolfcrypt_first.c \

37
cmake/functions.cmake
View File

@ -321,43 +321,6 @@ function(generate_lib_src_list LIB_SOURCES)
# Corresponds to src/include.am
if(BUILD_FIPS)
if(BUILD_FIPS_V1)
# fips first file
list(APPEND LIB_SOURCES ctaocrypt/src/wolfcrypt_first.c)
list(APPEND LIB_SOURCES
ctaocrypt/src/hmac.c
ctaocrypt/src/random.c
ctaocrypt/src/sha256.c)
if(BUILD_RSA)
list(APPEND LIB_SOURCES ctaocrypt/src/rsa.c)
endif()
if(BUILD_AES)
list(APPEND LIB_SOURCES ctaocrypt/src/aes.c)
endif()
if(BUILD_DES3)
list(APPEND LIB_SOURCES ctaocrypt/src/des3.c)
endif()
if(BUILD_SHA)
list(APPEND LIB_SOURCES ctaocrypt/src/sha.c)
endif()
if(BUILD_SHA512)
list(APPEND LIB_SOURCES ctaocrypt/src/sha512.c)
endif()
list(APPEND LIB_SOURCES
ctaocrypt/src/fips.c
ctaocrypt/src/fips_test.c)
# fips last file
list(APPEND LIB_SOURCES ctaocrypt/src/wolfcrypt_last.c)
endif()
if(BUILD_FIPS_V2)
# FIPSv2 first file
list(APPEND LIB_SOURCES wolfcrypt/src/wolfcrypt_first.c)

7
configure.ac
View File

@ -418,16 +418,11 @@ fi
AS_CASE([$FIPS_VERSION],
[none],
[
AS_IF([ test -s $srcdir/wolfcrypt/src/fips.c -o -s $srcdir/ctaocrypt/src/fips.c ],
AS_IF([ test -s $srcdir/wolfcrypt/src/fips.c ],
[AC_MSG_ERROR([FIPS source tree is incompatible with non-FIPS build (requires --enable-fips)])])
],
[disabled],
[],
[v1],
[
AS_IF([ ! test -s $srcdir/ctaocrypt/src/fips.c],
[AC_MSG_ERROR([non-FIPS-v1 source tree is incompatible with --enable-fips=$enableval])])
],
[
AS_IF([ ! test -s $srcdir/wolfcrypt/src/fips.c],
[AC_MSG_ERROR([non-FIPS source tree is incompatible with --enable-fips=$enableval])])

2
examples/echoclient/echoclient.c
View File

@ -145,7 +145,7 @@ void echoclient_test(void* args)
#endif
#elif !defined(NO_TLS)
#if defined(WOLFSSL_TLS13) && defined(WOLFSSL_SNIFFER)
method = WolfTLSv1_2_client_method();
method = wolfTLSv1_2_client_method();
#else
method = wolfSSLv23_client_method();
#endif

38
src/include.am
View File

@ -3,8 +3,6 @@
# All paths should be given relative to the root
FIPS_FILES = \
ctaocrypt/src/fips.c \
ctaocrypt/src/fips_test.c \
wolfcrypt/src/async.c \
wolfcrypt/src/fips.c \
wolfcrypt/src/fips_test.c \
@ -54,42 +52,6 @@ endif # BUILD_FAST_RSA
if BUILD_FIPS
if BUILD_FIPS_V1
# fips first file
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/wolfcrypt_first.c
src_libwolfssl@LIBSUFFIX@_la_SOURCES += \
ctaocrypt/src/hmac.c \
ctaocrypt/src/random.c \
ctaocrypt/src/sha256.c
if BUILD_RSA
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/rsa.c
endif
if BUILD_AES
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/aes.c
endif
if BUILD_DES3
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/des3.c
endif
if BUILD_SHA
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/sha.c
endif
if BUILD_SHA512
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/sha512.c
endif
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/fips.c
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/fips_test.c
# fips last file
src_libwolfssl@LIBSUFFIX@_la_SOURCES += ctaocrypt/src/wolfcrypt_last.c
endif BUILD_FIPS_V1
if BUILD_FIPS_V2
# FIPSv2 first file
src_libwolfssl@LIBSUFFIX@_la_SOURCES += \

2
wolfcrypt/src/des3.c
View File

@ -517,7 +517,7 @@
#elif defined(HAVE_COLDFIRE_SEC)
#include <wolfssl/ctaocrypt/types.h>
#include <wolfssl/wolfcrypt/types.h>
#include "sec.h"
#include "mcf5475_sec.h"