From 25f542adb4b078d6be6ee191123a29ce7f4e3a4a Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Tue, 1 Aug 2023 13:40:52 -0400
Subject: [PATCH] Clean up compile errors

---
 autogen.sh                       |  2 --
 cmake/functions.cmake            | 37 -------------------------------
 configure.ac                     |  7 +-----
 examples/echoclient/echoclient.c |  2 +-
 src/include.am                   | 38 --------------------------------
 wolfcrypt/src/des3.c             |  2 +-
 6 files changed, 3 insertions(+), 85 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index c5d55d0d0..6750b5bb1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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 \
diff --git a/cmake/functions.cmake b/cmake/functions.cmake
index f0fc48c2e..51c1e8410 100644
--- a/cmake/functions.cmake
+++ b/cmake/functions.cmake
@@ -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)
diff --git a/configure.ac b/configure.ac
index 031b93ce8..06124580d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])])
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 0c6444700..662aca0f1 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -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
diff --git a/src/include.am b/src/include.am
index 3af90743c..81c61310f 100644
--- a/src/include.am
+++ b/src/include.am
@@ -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 += \
diff --git a/wolfcrypt/src/des3.c b/wolfcrypt/src/des3.c
index d932a4a2a..e6c8e2d8f 100644
--- a/wolfcrypt/src/des3.c
+++ b/wolfcrypt/src/des3.c
@@ -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"