Skip to content

Commit 7f0cfcb

Browse files
JacobBarthelmehJacobBarthelmeh
authored
Merge pull request #6667 from bandi13/byebyeCyaSSL
Byebye cya ssl
2 parents 71f9162 + a6c850d commit 7f0cfcb

168 files changed

Lines changed: 207 additions & 6323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,7 +1963,6 @@ else()
19631963
set(WOLFSSL_OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR})
19641964
endif()
19651965
set(OPTION_FILE "${WOLFSSL_OUTPUT_BASE}/wolfssl/options.h")
1966-
set(CYASSL_OPTION_FILE "${WOLFSSL_OUTPUT_BASE}/cyassl/options.h")
19671966

19681967
file(REMOVE ${OPTION_FILE})
19691968

@@ -1993,14 +1992,6 @@ file(APPEND ${OPTION_FILE} "}\n")
19931992
file(APPEND ${OPTION_FILE} "#endif\n\n\n")
19941993
file(APPEND ${OPTION_FILE} "#endif /* WOLFSSL_OPTIONS_H */\n\n")
19951994

1996-
# backwards compatibility for those who have included options or version
1997-
file(REMOVE ${CYASSL_OPTION_FILE})
1998-
file(APPEND ${CYASSL_OPTION_FILE} "/* cyassl options.h\n")
1999-
file(APPEND ${CYASSL_OPTION_FILE} " * generated from wolfssl/options.h\n")
2000-
file(APPEND ${CYASSL_OPTION_FILE} " */\n")
2001-
file(READ ${OPTION_FILE} OPTION_FILE_CONTENTS)
2002-
file(APPEND ${CYASSL_OPTION_FILE} ${OPTION_FILE_CONTENTS})
2003-
20041995
####################################################
20051996
# Library Target
20061997
####################################################
@@ -2206,7 +2197,6 @@ include(GNUInstallDirs)
22062197

22072198
set(HEADER_EXCLUDE
22082199
"internal.h"
2209-
"cyassl/ctaocrypt/port"
22102200
"wolfssl/wolfcrypt/port/nrf51.h"
22112201
"wolfssl/wolfcrypt/port/arm"
22122202
"wolfssl/wolfcrypt/port/cypress"
@@ -2351,19 +2341,10 @@ install(DIRECTORY ${WOLFSSL_OUTPUT_BASE}/wolfssl/
23512341
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolfssl
23522342
FILES_MATCHING PATTERN "*.h"
23532343
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
2354-
install(DIRECTORY ${WOLFSSL_OUTPUT_BASE}/cyassl/
2355-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cyassl
2356-
FILES_MATCHING PATTERN "*.h"
2357-
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
23582344
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/
23592345
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolfssl
23602346
FILES_MATCHING PATTERN "*.h"
23612347
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
2362-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cyassl/
2363-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cyassl
2364-
FILES_MATCHING PATTERN "*.h"
2365-
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
2366-
23672348

23682349
# Install the examples
23692350
install(FILES ${INSTALLED_EXAMPLES}

‎IDE/WIN/test.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<ClCompile>
112112
<Optimization>Disabled</Optimization>
113113
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115115
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
116116
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
117117
<PrecompiledHeader />
@@ -130,7 +130,7 @@
130130
<ClCompile>
131131
<Optimization>Disabled</Optimization>
132132
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134134
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
135135
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
136136
<PrecompiledHeader />
@@ -147,7 +147,7 @@
147147
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
148148
<ClCompile>
149149
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151151
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
152152
<PrecompiledHeader />
153153
<WarningLevel>Level3</WarningLevel>
@@ -168,7 +168,7 @@
168168
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
169169
<ClCompile>
170170
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
172172
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
173173
<PrecompiledHeader />
174174
<WarningLevel>Level3</WarningLevel>
@@ -188,7 +188,7 @@
188188
<ClCompile>
189189
<Optimization>Disabled</Optimization>
190190
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
191-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
191+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
192192
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
193193
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
194194
<PrecompiledHeader />
@@ -208,7 +208,7 @@
208208
<ClCompile>
209209
<Optimization>Disabled</Optimization>
210210
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
211-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
211+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212212
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
213213
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
214214
<PrecompiledHeader />
@@ -226,7 +226,7 @@
226226
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
227227
<ClCompile>
228228
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
229-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
229+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
230230
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
231231
<PrecompiledHeader />
232232
<WarningLevel>Level3</WarningLevel>
@@ -246,7 +246,7 @@
246246
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
247247
<ClCompile>
248248
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
249-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
249+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_FIPS;USE_CERT_BUFFERS_2048;WOLFSSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
250250
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
251251
<PrecompiledHeader />
252252
<WarningLevel>Level3</WarningLevel>

‎IDE/WIN/wolfssl-fips.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<ClCompile>
122122
<Optimization>Disabled</Optimization>
123123
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
124-
<PreprocessorDefinitions>HAVE_FIPS;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124+
<PreprocessorDefinitions>HAVE_FIPS;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125125
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
126126
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
127127
<WarningLevel>Level4</WarningLevel>
@@ -133,7 +133,7 @@
133133
<ClCompile>
134134
<Optimization>Disabled</Optimization>
135135
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136-
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137137
<MinimalRebuild>true</MinimalRebuild>
138138
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
139139
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -152,7 +152,7 @@
152152
<ClCompile>
153153
<Optimization>Disabled</Optimization>
154154
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155-
<PreprocessorDefinitions>HAVE_FIPS;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+
<PreprocessorDefinitions>HAVE_FIPS;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
156156
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
157157
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
158158
<WarningLevel>Level4</WarningLevel>
@@ -164,7 +164,7 @@
164164
<ClCompile>
165165
<Optimization>Disabled</Optimization>
166166
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167-
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167+
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168168
<MinimalRebuild>true</MinimalRebuild>
169169
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
170170
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -183,7 +183,7 @@
183183
<Optimization>MaxSpeed</Optimization>
184184
<IntrinsicFunctions>true</IntrinsicFunctions>
185185
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
186-
<PreprocessorDefinitions>WIN32;HAVE_FIPS;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186+
<PreprocessorDefinitions>WIN32;HAVE_FIPS;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
187187
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
188188
<FunctionLevelLinking>true</FunctionLevelLinking>
189189
<WarningLevel>Level3</WarningLevel>
@@ -196,7 +196,7 @@
196196
<Optimization>MaxSpeed</Optimization>
197197
<IntrinsicFunctions>true</IntrinsicFunctions>
198198
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199-
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
199+
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200200
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
201201
<FunctionLevelLinking>true</FunctionLevelLinking>
202202
<WarningLevel>Level3</WarningLevel>
@@ -213,7 +213,7 @@
213213
<Optimization>MaxSpeed</Optimization>
214214
<IntrinsicFunctions>true</IntrinsicFunctions>
215215
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
216-
<PreprocessorDefinitions>HAVE_FIPS;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
216+
<PreprocessorDefinitions>HAVE_FIPS;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
217217
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
218218
<FunctionLevelLinking>true</FunctionLevelLinking>
219219
<WarningLevel>Level3</WarningLevel>
@@ -226,7 +226,7 @@
226226
<Optimization>MaxSpeed</Optimization>
227227
<IntrinsicFunctions>true</IntrinsicFunctions>
228228
<AdditionalIncludeDirectories>./;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
229-
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
229+
<PreprocessorDefinitions>HAVE_FIPS;BUILDING_WOLFSSL;CYASSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
230230
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
231231
<FunctionLevelLinking>true</FunctionLevelLinking>
232232
<WarningLevel>Level3</WarningLevel>

‎IDE/WIN10/test.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<ClCompile>
209209
<Optimization>Disabled</Optimization>
210210
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
211-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;HAVE_FIPS_VERSION=5;HAVE_FIPS_VERSION_MINOR=1;USE_CERT_BUFFERS_2048;USE_CERT_BUFFERS_256;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
211+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_FIPS;HAVE_FIPS_VERSION=5;HAVE_FIPS_VERSION_MINOR=1;USE_CERT_BUFFERS_2048;USE_CERT_BUFFERS_256;WOLFSSL_USER_SETTINGS;CYASSL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212212
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
213213
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
214214
<PrecompiledHeader />

‎Makefile.am‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ EXTRA_DIST+= m4/ax_atomic.m4
161161

162162
include cmake/include.am
163163
include wrapper/include.am
164-
include cyassl/include.am
165164
include wolfssl/include.am
166165
include certs/include.am
167166
include doc/include.am
@@ -245,7 +244,6 @@ test: check
245244
tests/unit.log: testsuite/testsuite.log
246245
scripts/unit.log: testsuite/testsuite.log
247246

248-
DISTCLEANFILES+= cyassl-config
249247
DISTCLEANFILES+= wolfssl-config
250248

251249
MAINTAINERCLEANFILES+= wolfssl/wolfcrypt/async.h
@@ -267,7 +265,6 @@ maintainer-clean-local:
267265
-rm build-aux/install-sh
268266
-rm build-aux/ltmain.sh
269267
-rm build-aux/missing
270-
-rm cyassl-config
271268
-rmdir build-aux
272269
-rm configure
273270
-rm config.log

‎autogen.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ done
3030

3131
for file in \
3232
./wolfssl/options.h \
33-
./ctaocrypt/src/fips.c \
34-
./ctaocrypt/src/fips_test.c \
3533
./wolfcrypt/src/fips.c \
3634
./wolfcrypt/src/fips_test.c \
3735
./wolfcrypt/src/wolfcrypt_first.c \

‎cmake/functions.cmake‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -321,43 +321,6 @@ function(generate_lib_src_list LIB_SOURCES)
321321

322322
# Corresponds to src/include.am
323323
if(BUILD_FIPS)
324-
if(BUILD_FIPS_V1)
325-
# fips first file
326-
list(APPEND LIB_SOURCES ctaocrypt/src/wolfcrypt_first.c)
327-
328-
list(APPEND LIB_SOURCES
329-
ctaocrypt/src/hmac.c
330-
ctaocrypt/src/random.c
331-
ctaocrypt/src/sha256.c)
332-
333-
if(BUILD_RSA)
334-
list(APPEND LIB_SOURCES ctaocrypt/src/rsa.c)
335-
endif()
336-
337-
if(BUILD_AES)
338-
list(APPEND LIB_SOURCES ctaocrypt/src/aes.c)
339-
endif()
340-
341-
if(BUILD_DES3)
342-
list(APPEND LIB_SOURCES ctaocrypt/src/des3.c)
343-
endif()
344-
345-
if(BUILD_SHA)
346-
list(APPEND LIB_SOURCES ctaocrypt/src/sha.c)
347-
endif()
348-
349-
if(BUILD_SHA512)
350-
list(APPEND LIB_SOURCES ctaocrypt/src/sha512.c)
351-
endif()
352-
353-
list(APPEND LIB_SOURCES
354-
ctaocrypt/src/fips.c
355-
ctaocrypt/src/fips_test.c)
356-
357-
# fips last file
358-
list(APPEND LIB_SOURCES ctaocrypt/src/wolfcrypt_last.c)
359-
endif()
360-
361324
if(BUILD_FIPS_V2)
362325
# FIPSv2 first file
363326
list(APPEND LIB_SOURCES wolfcrypt/src/wolfcrypt_first.c)

‎configure.ac‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -417,16 +417,11 @@ fi
417417
AS_CASE([$FIPS_VERSION],
418418
[none],
419419
[
420-
AS_IF([ test -s $srcdir/wolfcrypt/src/fips.c -o -s $srcdir/ctaocrypt/src/fips.c ],
420+
AS_IF([ test -s $srcdir/wolfcrypt/src/fips.c ],
421421
[AC_MSG_ERROR([FIPS source tree is incompatible with non-FIPS build (requires --enable-fips)])])
422422
],
423423
[disabled],
424424
[],
425-
[v1],
426-
[
427-
AS_IF([ ! test -s $srcdir/ctaocrypt/src/fips.c],
428-
[AC_MSG_ERROR([non-FIPS-v1 source tree is incompatible with --enable-fips=$enableval])])
429-
],
430425
[
431426
AS_IF([ ! test -s $srcdir/wolfcrypt/src/fips.c],
432427
[AC_MSG_ERROR([non-FIPS source tree is incompatible with --enable-fips=$enableval])])
@@ -9015,7 +9010,6 @@ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
90159010
AC_CONFIG_FILES([Makefile
90169011
wolfssl/version.h
90179012
wolfssl/options.h
9018-
cyassl/options.h
90199013
support/wolfssl.pc
90209014
rpm/spec
90219015
wolfcrypt/test/test_paths.h
@@ -9159,28 +9153,6 @@ echo "" >> $OPTION_FILE
91599153
echo "#endif /* WOLFSSL_OPTIONS_H */" >> $OPTION_FILE
91609154
echo "" >> $OPTION_FILE
91619155

9162-
#backwards compatibility for those who have included options or version
9163-
touch cyassl/options.h
9164-
echo "/* cyassl options.h" > cyassl/options.h
9165-
echo " * generated from wolfssl/options.h" >> cyassl/options.h
9166-
echo " */" >> cyassl/options.h
9167-
9168-
while read -r line
9169-
do
9170-
echo "$line" >> cyassl/options.h
9171-
done < $OPTION_FILE
9172-
9173-
# switch ifdef protection in cyassl/option.h to CYASSL_OPTONS_H, remove bak
9174-
sed -i.bak 's/WOLFSSL_OPTIONS_H/CYASSL_OPTIONS_H/g' cyassl/options.h
9175-
9176-
# workaround for mingw sed that may get "Permission denied" trying to preserve permissions
9177-
case $host_os in
9178-
mingw*)
9179-
chmod u+w cyassl/options.h ;;
9180-
esac
9181-
9182-
rm cyassl/options.h.bak
9183-
91849156
if test "$ENABLED_OPENSSLEXTRA" = "yes" && test "$ENABLED_LINUXKM" = "no"
91859157
then
91869158
SAVE_CFLAGS=$CFLAGS

‎ctaocrypt/ctaocrypt.sln‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)