Skip to content

Commit f7bb4d3

Browse files
anhuanhu
committed
Remove support for arc4.
1 parent 294e4c7 commit f7bb4d3

File tree

184 files changed

+103
-2326
lines changed

Some content is hidden

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

184 files changed

+103
-2326
lines changed

‎CMakeLists.txt

-19
Original file line numberDiff line numberDiff line change
@@ -1354,14 +1354,6 @@ if(NOT WOLFSSL_DES3_TLS_SUITES)
13541354
list(APPEND WOLFSSL_DEFINITIONS "-DNO_DES3_TLS_SUITES")
13551355
endif()
13561356

1357-
# ARC4
1358-
set(WOLFSSL_ARC4_HELP_STRING "Enable ARC4 (default: disabled)")
1359-
add_option("WOLFSSL_ARC4" ${WOLFSSL_ARC4_HELP_STRING} "no" "yes;no")
1360-
1361-
if(WOLFSSL_OPENSSH OR WOLFSSL_WPAS)
1362-
override_cache(WOLFSSL_ARC4 "yes")
1363-
endif()
1364-
13651357
# MD5
13661358
set(WOLFSSL_MD5_HELP_STRING "Enable MD5 (default: enabled)")
13671359
add_option("WOLFSSL_MD5" ${WOLFSSL_MD5_HELP_STRING} "yes" "yes;no")
@@ -1663,16 +1655,6 @@ if(WOLFSSL_EXTENDED_MASTER)
16631655
endif()
16641656

16651657

1666-
if(NOT WOLFSSL_ARC4)
1667-
list(APPEND WOLFSSL_DEFINITIONS "-DNO_RC4")
1668-
else()
1669-
# turn off ARC4 if leanpsk or leantls on
1670-
if(WOLFSSL_LEAN_PSK OR WOLFSSL_LEAN_TLS)
1671-
list(APPEND WOLFSSL_DEFINITIONS "-DNO_RC4")
1672-
override_cache(WOLFSSL_ARC4 "no")
1673-
endif()
1674-
endif()
1675-
16761658
# TODO: - TLS extensions
16771659
# - Early data handshake
16781660
# - SCEP
@@ -2553,7 +2535,6 @@ if(WOLFSSL_EXAMPLES)
25532535
tests/api/test_poly1305.c
25542536
tests/api/test_chacha20_poly1305.c
25552537
tests/api/test_camellia.c
2556-
tests/api/test_arc4.c
25572538
tests/api/test_rc2.c
25582539
tests/api/test_aes.c
25592540
tests/api/test_ascon.c

‎IDE/AURIX/user_settings.h

-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ extern unsigned int my_rng_seed_gen(void);
446446
#define NO_PSK
447447

448448
#define NO_DSA
449-
#define NO_RC4
450449
#define NO_MD4
451450
#define NO_PWDBASED
452451
//#define NO_CODING

‎IDE/Android/Android.bp

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ cc_library_shared {
4040
"./src/wolfio.c",
4141
] + [
4242
"./wolfcrypt/src/aes.c",
43-
"./wolfcrypt/src/arc4.c",
4443
"./wolfcrypt/src/asm.c",
4544
"./wolfcrypt/src/asn.c",
4645
"./wolfcrypt/src/blake2b.c",

‎IDE/Android/user_settings.h

-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
#define HAVE_CRL
122122

123123
#define NO_DSA
124-
#define NO_RC4
125124
#define NO_PSK
126125
#define WOLFSSL_NO_SHAKE256
127126
#define NO_MD4

‎IDE/CRYPTOCELL/user_settings.h

-3
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,6 @@ extern "C" {
552552
#undef NO_DSA
553553
#define NO_DSA
554554

555-
#undef NO_RC4
556-
#define NO_RC4
557-
558555
#undef NO_OLD_TLS
559556
#define NO_OLD_TLS
560557

‎IDE/ECLIPSE/DEOS/deos_wolfssl/.project

-5
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,6 @@
109109
<type>1</type>
110110
<locationURI>WOLFSSL_ROOT/wolfcrypt/src/aes.c</locationURI>
111111
</link>
112-
<link>
113-
<name>wolfcrypt/src/arc4.c</name>
114-
<type>1</type>
115-
<locationURI>WOLFSSL_ROOT/wolfcrypt/src/arc4.c</locationURI>
116-
</link>
117112
<link>
118113
<name>wolfcrypt/src/asm.c</name>
119114
<type>1</type>

‎IDE/ECLIPSE/DEOS/user_settings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ You can get the current time from https://www.unixtimestamp.com/ */
191191
#define NO_OLD_TLS
192192
#define NO_PSK
193193
#define NO_DSA
194-
#define NO_RC4
194+
195195
#define NO_MD4
196196

197197
#define NO_PWDBASED

‎IDE/ECLIPSE/RTTHREAD/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ HMAC-SHA256 test passed!
9292
HMAC-SHA512 test passed!
9393
X963-KDF test passed!
9494
GMAC test passed!
95-
ARC4 test passed!
9695
DES test passed!
9796
DES3 test passed!
9897
AES test passed!
@@ -141,7 +140,6 @@ AES-192-ECB-enc 2 MB took 1.000 seconds, 1.780 MB/s
141140
AES-192-ECB-dec 1 MB took 1.000 seconds, 1.433 MB/s
142141
AES-256-ECB-enc 2 MB took 1.000 seconds, 1.638 MB/s
143142
AES-256-ECB-dec 1 MB took 1.000 seconds, 1.405 MB/s
144-
ARC4 5 MB took 1.000 seconds, 4.956 MB/s
145143
RABBIT 6 MB took 1.000 seconds, 6.470 MB/s
146144
3DES 750 KB took 1.000 seconds, 750.000 KB/s
147145
MD5 12 MB took 1.000 seconds, 12.061 MB/s

‎IDE/Espressif/ESP-IDF/examples/template/components/wolfssl/component.mk

-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/src/wolfio.o
176176
## wolfcrypt
177177
##
178178
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/aes.o
179-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/arc4.o
180179
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asm.o
181180
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asn.o
182181
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/async.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/components/wolfssl/component.mk

-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/src/wolfio.o
176176
## wolfcrypt
177177
##
178178
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/aes.o
179-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/arc4.o
180179
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asm.o
181180
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asn.o
182181
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/async.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_client/components/wolfssl/component.mk

-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/src/wolfio.o
176176
## wolfcrypt
177177
##
178178
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/aes.o
179-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/arc4.o
180179
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asm.o
181180
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asn.o
182181
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/async.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_server/components/wolfssl/component.mk

-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/src/wolfio.o
176176
## wolfcrypt
177177
##
178178
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/aes.o
179-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/arc4.o
180179
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asm.o
181180
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asn.o
182181
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/async.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_test/components/wolfssl/component.mk

-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/src/wolfio.o
176176
## wolfcrypt
177177
##
178178
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/aes.o
179-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/arc4.o
180179
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asm.o
181180
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/asn.o
182181
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/async.o # autogen exclusion

‎IDE/GCC-ARM/Header/user_settings.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,7 @@ extern unsigned int my_rng_seed_gen(void);
620620
#undef NO_DSA
621621
#define NO_DSA
622622

623-
#undef NO_RC4
624-
#define NO_RC4
623+
625624

626625
#undef NO_OLD_TLS
627626
#define NO_OLD_TLS

‎IDE/GCC-ARM/Makefile.common

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ SRC_C += ../../wolfcrypt/src/selftest.c
178178
endif
179179

180180
# wolfCrypt non-standard algorithms (disabled by default)
181-
SRC_C += ../../wolfcrypt/src/arc4.c
182181
SRC_C += ../../wolfcrypt/src/blake2b.c
183182
SRC_C += ../../wolfcrypt/src/camellia.c
184183
SRC_C += ../../wolfcrypt/src/dsa.c

‎IDE/HEXAGON/DSP/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ libwolfssl_dsp_skel.C_SRCS += ../../../wolfcrypt/src/wolfmath.c
8080
#eccverify_q.C_SRCS += ../../../wolfcrypt/src/wc_encrypt.c
8181
#eccverify_q.C_SRCS += ../../../wolfcrypt/src/pwdbased.c
8282
#eccverify_q.C_SRCS += ../../../wolfcrypt/src/hash.c
83-
#eccverify_q.C_SRCS += ../../../wolfcrypt/src/arc4.c
8483
#eccverify_q.C_SRCS += ../../../wolfcrypt/src/hmac.c
8584
#eccverify_q.C_SRCS += ../../../wolfcrypt/src/md5.c
8685
#eccverify_q.C_SRCS += ../../../wolfcrypt/src/coding.c

‎IDE/HEXAGON/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ libwolfssl_LD_FLAGS += -ldl
6565
libwolfssl_C_SRCS += \
6666
../../wolfcrypt/src/aes \
6767
../../wolfcrypt/src/md2 \
68-
../../wolfcrypt/src/arc4 \
6968
../../wolfcrypt/src/md4 \
7069
../../wolfcrypt/src/asm \
7170
../../wolfcrypt/src/md5 \

‎IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp

-3
Original file line numberDiff line numberDiff line change
@@ -1903,9 +1903,6 @@
19031903
<file>
19041904
<name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\aes.c</name>
19051905
</file>
1906-
<file>
1907-
<name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\arc4.c</name>
1908-
</file>
19091906
<file>
19101907
<name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\asm.c</name>
19111908
</file>

‎IDE/IAR-MSP430/user_settings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ extern "C" {
8989
#define NO_DSA
9090
#define NO_RSA
9191
#define NO_DH
92-
#define NO_RC4
92+
9393
#define NO_MD4
9494
#define NO_MD5
9595
#define NO_SHA

‎IDE/INTIME-RTOS/libwolfssl.vcxproj

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<ClCompile Include="..\..\src\ssl.c" />
2525
<ClCompile Include="..\..\src\tls.c" />
2626
<ClCompile Include="..\..\wolfcrypt\src\aes.c" />
27-
<ClCompile Include="..\..\wolfcrypt\src\arc4.c" />
2827
<ClCompile Include="..\..\wolfcrypt\src\asm.c" />
2928
<ClCompile Include="..\..\wolfcrypt\src\asn.c" />
3029
<ClCompile Include="..\..\wolfcrypt\src\blake2b.c" />
@@ -87,7 +86,6 @@
8786
<ClInclude Include="..\..\wolfssl\test.h" />
8887
<ClInclude Include="..\..\wolfssl\version.h" />
8988
<ClInclude Include="..\..\wolfssl\wolfcrypt\aes.h" />
90-
<ClInclude Include="..\..\wolfssl\wolfcrypt\arc4.h" />
9189
<ClInclude Include="..\..\wolfssl\wolfcrypt\asn.h" />
9290
<ClInclude Include="..\..\wolfssl\wolfcrypt\asn_public.h" />
9391
<ClInclude Include="..\..\wolfssl\wolfcrypt\async.h" />

‎IDE/INTIME-RTOS/user_settings.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,7 @@ extern "C" {
415415
#undef NO_FILESYSTEM
416416
//#define NO_FILESYSTEM
417417

418-
#undef NO_RC4
419-
#define NO_RC4
418+
420419

421420
#undef NO_MD4
422421
#define NO_MD4

‎IDE/Infineon/user_settings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ extern "C" {
147147
#define NO_PWDBASED
148148
#define NO_DSA
149149
#define NO_DES3
150-
#define NO_RC4
150+
151151
#define NO_PSK
152152
#define NO_MD4
153153
#define NO_MD5

‎IDE/KDS/.project

-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
<type>1</type>
3636
<locationURI>PARENT-2-PROJECT_LOC/wolfcrypt/src/aes.c</locationURI>
3737
</link>
38-
<link>
39-
<name>src/wolfcrypt-src/arc4.c</name>
40-
<type>1</type>
41-
<locationURI>PARENT-2-PROJECT_LOC/wolfcrypt/src/arc4.c</locationURI>
42-
</link>
4338
<link>
4439
<name>src/wolfcrypt-src/asm.c</name>
4540
<type>1</type>

‎IDE/LINUX-SGX/sgx_t_static.mk

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Crypto_Library_Name := sgx_tcrypto
4747
Wolfssl_C_Extra_Flags := -DWOLFSSL_SGX
4848

4949
Wolfssl_C_Files :=$(WOLFSSL_ROOT)/wolfcrypt/src/aes.c\
50-
$(WOLFSSL_ROOT)/wolfcrypt/src/arc4.c\
5150
$(WOLFSSL_ROOT)/wolfcrypt/src/asn.c\
5251
$(WOLFSSL_ROOT)/wolfcrypt/src/blake2b.c\
5352
$(WOLFSSL_ROOT)/wolfcrypt/src/camellia.c\

‎IDE/LPCXPRESSO/lib_wolfssl/user_settings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define NO_OLD_TLS
5454
#define NO_DES3
5555
#define NO_MD5
56-
#define NO_RC4
56+
5757
#define NO_DH
5858
#define NO_SHA
5959

‎IDE/M68K/user_settings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
#define NO_ASN_TIME
5050
#define NO_PWDBASED
51-
#define NO_RC4
51+
5252
#define NO_DSA
5353
#define NO_DES3
5454
#define NO_DH

‎IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
// <h>wolfCrypt Library
101101

102-
// <h>MD5, SHA, SHA-256, AES, RC4, ASN, RSA
102+
// <h>MD5, SHA, SHA-256, AES, ASN, RSA
103103
// </h>
104104
// <e>MD2
105105
#define MDK_CONF_MD2 0

‎IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135

136136
// <h>wolfCrypt Library
137137

138-
// <h>MD5, SHA, SHA-256, AES, RC4, ASN, RSA
138+
// <h>MD5, SHA, SHA-256, AES, ASN, RSA
139139
// </h>
140140

141141
// <e>MD2

‎IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158

159159
// <h>wolfCrypt Library
160160

161-
// <h>MD5, SHA, SHA-256, AES, RC4, ASN, RSA
161+
// <h>MD5, SHA, SHA-256, AES, ASN, RSA
162162
// </h>
163163
// <e>MD2
164164
#define MDK_CONF_MD2 0

‎IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c

-6
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ extern void hmac_sha256_test(void *arg) ;
141141
extern void hmac_sha384_test(void *arg) ;
142142
#endif
143143
#endif
144-
#ifndef NO_RC4
145-
extern void arc4_test(void *arg) ;
146-
#endif
147144

148145
#ifndef NO_DES3
149146
extern void des_test(void *arg) ;
@@ -256,9 +253,6 @@ static struct {
256253
"hmac_sha384", hmac_sha384_test,
257254
#endif
258255
#endif
259-
#ifndef NO_RC4
260-
"arc4", arc4_test,
261-
#endif
262256
#ifndef NO_DES3
263257
"des", des_test,
264258
"des3", des3_test,

‎IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt

-13
Original file line numberDiff line numberDiff line change
@@ -596,19 +596,6 @@
596596
<RteFlg>0</RteFlg>
597597
<bShared>0</bShared>
598598
</File>
599-
<File>
600-
<GroupNumber>1</GroupNumber>
601-
<FileNumber>3</FileNumber>
602-
<FileType>1</FileType>
603-
<tvExp>0</tvExp>
604-
<Focus>0</Focus>
605-
<tvExpOptDlg>0</tvExpOptDlg>
606-
<bDave2>0</bDave2>
607-
<PathWithFileName>..\..\..\wolfcrypt\src\arc4.c</PathWithFileName>
608-
<FilenameWithoutPath>arc4.c</FilenameWithoutPath>
609-
<RteFlg>0</RteFlg>
610-
<bShared>0</bShared>
611-
</File>
612599
<File>
613600
<GroupNumber>1</GroupNumber>
614601
<FileNumber>4</FileNumber>

‎IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj

-15
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,6 @@
416416
<FileType>1</FileType>
417417
<FilePath>..\..\..\wolfcrypt\src\aes.c</FilePath>
418418
</File>
419-
<File>
420-
<FileName>arc4.c</FileName>
421-
<FileType>1</FileType>
422-
<FilePath>..\..\..\wolfcrypt\src\arc4.c</FilePath>
423-
</File>
424419
<File>
425420
<FileName>asm.c</FileName>
426421
<FileType>1</FileType>
@@ -1120,11 +1115,6 @@
11201115
<FileType>1</FileType>
11211116
<FilePath>..\..\..\wolfcrypt\src\aes.c</FilePath>
11221117
</File>
1123-
<File>
1124-
<FileName>arc4.c</FileName>
1125-
<FileType>1</FileType>
1126-
<FilePath>..\..\..\wolfcrypt\src\arc4.c</FilePath>
1127-
</File>
11281118
<File>
11291119
<FileName>asm.c</FileName>
11301120
<FileType>1</FileType>
@@ -1824,11 +1814,6 @@
18241814
<FileType>1</FileType>
18251815
<FilePath>..\..\..\wolfcrypt\src\aes.c</FilePath>
18261816
</File>
1827-
<File>
1828-
<FileName>arc4.c</FileName>
1829-
<FileType>1</FileType>
1830-
<FilePath>..\..\..\wolfcrypt\src\arc4.c</FilePath>
1831-
</File>
18321817
<File>
18331818
<FileName>asm.c</FileName>
18341819
<FileType>1</FileType>

‎IDE/MDK5-ARM/Conf/user_settings.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,7 @@
239239
#endif
240240
// </e>
241241

242-
// <e>RC4
243-
#define MDK_CONF_RC4 0
244-
#if MDK_CONF_RC4 == 0
245-
#define NO_RC4
246-
#endif
247-
// </e>
242+
248243

249244
// <e>CHACHA
250245
#define MDK_CONF_CHACHA 1

0 commit comments

Comments
 (0)