From 3a5b7c72cd1e8532172d25f73d50f4d2feb3eea6 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 21:23:09 +0000 Subject: [PATCH] Remove all references to arc4/rc4 from IDE directory files Co-Authored-By: Anthony H --- IDE/AURIX/user_settings.h | 2 +- IDE/Android/user_settings.h | 2 +- IDE/CRYPTOCELL/user_settings.h | 3 +-- IDE/ECLIPSE/DEOS/user_settings.h | 2 +- IDE/GCC-ARM/Header/user_settings.h | 3 +-- IDE/IAR-MSP430/user_settings.h | 2 +- IDE/INTIME-RTOS/user_settings.h | 3 +-- IDE/Infineon/user_settings.h | 2 +- IDE/LPCXPRESSO/lib_wolfssl/user_settings.h | 2 +- IDE/M68K/user_settings.h | 2 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h | 2 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h | 2 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h | 2 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c | 4 ++++ IDE/MDK5-ARM/Conf/user_settings.h | 7 +------ IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c | 8 ++------ IDE/MPLABX16/user_settings.h | 3 +-- IDE/MQX/user_settings.h | 4 ++-- IDE/MSVS-2019-AZSPHERE/user_settings.h | 2 +- IDE/NETOS/user_settings.h | 3 +-- IDE/QNX/wolfssl/user_settings.h | 3 +-- IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h | 3 +-- IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c | 4 ++-- IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h | 3 +-- IDE/Renesas/cs+/Projects/common/user_settings.h | 2 +- IDE/Renesas/e2studio/RA6M3/common/user_settings.h | 2 +- IDE/STARCORE/user_settings.h | 3 +-- IDE/SimplicityStudio/user_settings.h | 2 +- IDE/VS-ARM/user_settings.h | 2 +- IDE/VS-AZURE-SPHERE/user_settings.h | 2 +- IDE/VisualDSP/user_settings.h | 3 +-- IDE/WICED-STUDIO/user_settings.h | 3 +-- IDE/WIN-SRTP-KDF-140-3/user_settings.h | 2 +- IDE/WIN/user_settings.h | 2 +- IDE/WIN/user_settings_dtls.h | 2 +- IDE/WIN10/user_settings.h | 2 +- IDE/WINCE/user_settings.h | 3 +-- IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h | 3 +-- IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h | 3 +-- IDE/XCODE-FIPSv2/user_settings.h | 3 +-- IDE/XCODE-FIPSv5/user_settings.h | 3 +-- IDE/XCODE/user_settings.h | 2 +- IDE/XilinxSDK/user_settings.h | 2 +- IDE/iotsafe/user_settings.h | 2 +- 44 files changed, 50 insertions(+), 71 deletions(-) diff --git a/IDE/AURIX/user_settings.h b/IDE/AURIX/user_settings.h index 1b484e751..e5ba431a2 100644 --- a/IDE/AURIX/user_settings.h +++ b/IDE/AURIX/user_settings.h @@ -446,7 +446,7 @@ extern unsigned int my_rng_seed_gen(void); #define NO_PSK #define NO_DSA -#define NO_RC4 + #define NO_MD4 #define NO_PWDBASED //#define NO_CODING diff --git a/IDE/Android/user_settings.h b/IDE/Android/user_settings.h index 7863a49c4..492b2b234 100644 --- a/IDE/Android/user_settings.h +++ b/IDE/Android/user_settings.h @@ -121,7 +121,7 @@ #define HAVE_CRL #define NO_DSA -#define NO_RC4 + #define NO_PSK #define WOLFSSL_NO_SHAKE256 #define NO_MD4 diff --git a/IDE/CRYPTOCELL/user_settings.h b/IDE/CRYPTOCELL/user_settings.h index e48dc1977..f91fd92bc 100644 --- a/IDE/CRYPTOCELL/user_settings.h +++ b/IDE/CRYPTOCELL/user_settings.h @@ -552,8 +552,7 @@ extern "C" { #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/ECLIPSE/DEOS/user_settings.h b/IDE/ECLIPSE/DEOS/user_settings.h index 0cfd0681b..c3dd65968 100644 --- a/IDE/ECLIPSE/DEOS/user_settings.h +++ b/IDE/ECLIPSE/DEOS/user_settings.h @@ -191,7 +191,7 @@ You can get the current time from https://www.unixtimestamp.com/ */ #define NO_OLD_TLS #define NO_PSK #define NO_DSA -#define NO_RC4 + #define NO_MD4 #define NO_PWDBASED diff --git a/IDE/GCC-ARM/Header/user_settings.h b/IDE/GCC-ARM/Header/user_settings.h index 9455d1833..1aa672f15 100644 --- a/IDE/GCC-ARM/Header/user_settings.h +++ b/IDE/GCC-ARM/Header/user_settings.h @@ -620,8 +620,7 @@ extern unsigned int my_rng_seed_gen(void); #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/IAR-MSP430/user_settings.h b/IDE/IAR-MSP430/user_settings.h index b4c79fcc3..6c5684059 100644 --- a/IDE/IAR-MSP430/user_settings.h +++ b/IDE/IAR-MSP430/user_settings.h @@ -89,7 +89,7 @@ extern "C" { #define NO_DSA #define NO_RSA #define NO_DH -#define NO_RC4 + #define NO_MD4 #define NO_MD5 #define NO_SHA diff --git a/IDE/INTIME-RTOS/user_settings.h b/IDE/INTIME-RTOS/user_settings.h index 9b6a9ba07..93e96e09a 100644 --- a/IDE/INTIME-RTOS/user_settings.h +++ b/IDE/INTIME-RTOS/user_settings.h @@ -415,8 +415,7 @@ extern "C" { #undef NO_FILESYSTEM //#define NO_FILESYSTEM -#undef NO_RC4 -#define NO_RC4 + #undef NO_MD4 #define NO_MD4 diff --git a/IDE/Infineon/user_settings.h b/IDE/Infineon/user_settings.h index 1b189bc6d..83e9e249f 100644 --- a/IDE/Infineon/user_settings.h +++ b/IDE/Infineon/user_settings.h @@ -147,7 +147,7 @@ extern "C" { #define NO_PWDBASED #define NO_DSA #define NO_DES3 -#define NO_RC4 + #define NO_PSK #define NO_MD4 #define NO_MD5 diff --git a/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h b/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h index 464b26158..4d35e26f7 100644 --- a/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h +++ b/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h @@ -53,7 +53,7 @@ #define NO_OLD_TLS #define NO_DES3 #define NO_MD5 -#define NO_RC4 + #define NO_DH #define NO_SHA diff --git a/IDE/M68K/user_settings.h b/IDE/M68K/user_settings.h index e3876f5ec..9c803a80b 100644 --- a/IDE/M68K/user_settings.h +++ b/IDE/M68K/user_settings.h @@ -48,7 +48,7 @@ #define NO_ASN_TIME #define NO_PWDBASED -#define NO_RC4 + #define NO_DSA #define NO_DES3 #define NO_DH diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h index 8f22bfcc1..a916e5a2d 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h @@ -99,7 +99,7 @@ // wolfCrypt Library -// MD5, SHA, SHA-256, AES, RC4, ASN, RSA +// MD5, SHA, SHA-256, AES, ASN, RSA // // MD2 #define MDK_CONF_MD2 0 diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h index ddd367b05..53e13009e 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h @@ -135,7 +135,7 @@ // wolfCrypt Library -// MD5, SHA, SHA-256, AES, RC4, ASN, RSA +// MD5, SHA, SHA-256, AES, ASN, RSA // // MD2 diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h index 1b93a77f1..f0801c02a 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h @@ -158,7 +158,7 @@ // wolfCrypt Library -// MD5, SHA, SHA-256, AES, RC4, ASN, RSA +// MD5, SHA, SHA-256, AES, ASN, RSA // // MD2 #define MDK_CONF_MD2 0 diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c index 73a29a689..3461302a8 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c @@ -253,6 +253,10 @@ static struct { "hmac_sha384", hmac_sha384_test, #endif #endif +<<<<<<< HEAD +======= + +>>>>>>> ed6cc3fea (Remove all references to arc4/rc4 from IDE directory files) #ifndef NO_DES3 "des", des_test, "des3", des3_test, diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h index b07e02a90..f76e624ef 100644 --- a/IDE/MDK5-ARM/Conf/user_settings.h +++ b/IDE/MDK5-ARM/Conf/user_settings.h @@ -239,12 +239,7 @@ #endif // -// RC4 -#define MDK_CONF_RC4 0 -#if MDK_CONF_RC4 == 0 -#define NO_RC4 -#endif -// + // CHACHA #define MDK_CONF_CHACHA 1 diff --git a/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c b/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c index a6dbd4239..a69d04b60 100644 --- a/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c +++ b/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c @@ -148,9 +148,7 @@ extern void hmac_sha256_test(void *arg) ; extern void hmac_sha384_test(void *arg) ; #endif #endif -#ifndef NO_RC4 -extern void arc4_test(void *arg) ; -#endif + #ifndef NO_DES3 extern void des_test(void *arg) ; @@ -263,9 +261,7 @@ static struct { "hmac_sha384", hmac_sha384_test, #endif #endif -#ifndef NO_RC4 - "arc4", arc4_test, -#endif + #ifndef NO_DES3 "des", des_test, "des3", des3_test, diff --git a/IDE/MPLABX16/user_settings.h b/IDE/MPLABX16/user_settings.h index 174551e95..ffa93b6d7 100644 --- a/IDE/MPLABX16/user_settings.h +++ b/IDE/MPLABX16/user_settings.h @@ -378,8 +378,7 @@ extern "C" { #undef NO_DH #define NO_DH -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/MQX/user_settings.h b/IDE/MQX/user_settings.h index 70602fe2f..f71b23d43 100644 --- a/IDE/MQX/user_settings.h +++ b/IDE/MQX/user_settings.h @@ -33,7 +33,7 @@ #define ECC_SHAMIR #define WC_RSA_PSS #define WOLFSSL_BASE64_ENCODE -#define NO_RC4 + #define WOLFSSL_SHA224 #define WOLFSSL_SHA3 #define WOLFSSL_SHAKE256 @@ -44,7 +44,7 @@ #define HAVE_TLS_EXTENSIONS #define HAVE_SUPPORTED_CURVES #define HAVE_EXTENDED_MASTER -#define NO_RC4 + #define HAVE_ENCRYPT_THEN_MAC #define NO_PSK #define NO_MD4 diff --git a/IDE/MSVS-2019-AZSPHERE/user_settings.h b/IDE/MSVS-2019-AZSPHERE/user_settings.h index 1c9ffcf4e..7a03fb57f 100644 --- a/IDE/MSVS-2019-AZSPHERE/user_settings.h +++ b/IDE/MSVS-2019-AZSPHERE/user_settings.h @@ -72,7 +72,7 @@ #define NO_PWDBASED #define NO_DSA #define NO_DES3 -#define NO_RC4 + #define NO_MD4 /* Benchmark / Testing */ diff --git a/IDE/NETOS/user_settings.h b/IDE/NETOS/user_settings.h index 9b40a623f..2eb914d23 100644 --- a/IDE/NETOS/user_settings.h +++ b/IDE/NETOS/user_settings.h @@ -572,8 +572,7 @@ extern "C" { #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/QNX/wolfssl/user_settings.h b/IDE/QNX/wolfssl/user_settings.h index 6015a4e5d..e6c1ad306 100644 --- a/IDE/QNX/wolfssl/user_settings.h +++ b/IDE/QNX/wolfssl/user_settings.h @@ -97,8 +97,7 @@ #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_PSK #define NO_PSK diff --git a/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h b/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h index 9c17a34e2..51599dc93 100644 --- a/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h +++ b/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h @@ -553,8 +553,7 @@ extern "C" { #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c index 333e73df6..d538fea05 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c @@ -79,7 +79,7 @@ void main(void) SAMPLE OUTPUT: Freescale K64 running at 96MHz with no MMCAU: Benchmark Test 0: AES 25 kB took 0.073 seconds, 0.334 MB/s -ARC4 25 kB took 0.033 seconds, 0.740 MB/s + RABBIT 25 kB took 0.027 seconds, 0.904 MB/s 3DES 25 kB took 0.375 seconds, 0.065 MB/s MD5 25 kB took 0.016 seconds, 1.526 MB/s @@ -94,7 +94,7 @@ Benchmark Test 0: Return code 0 SAMPLE OUTPUT: Freescale K64 running at 96MHz with MMCAU enabled: Benchmark Test 0: AES 25 kB took 0.019 seconds, 1.285 MB/s -ARC4 25 kB took 0.033 seconds, 0.740 MB/s + RABBIT 25 kB took 0.028 seconds, 0.872 MB/s 3DES 25 kB took 0.026 seconds, 0.939 MB/s MD5 25 kB took 0.005 seconds, 4.883 MB/s diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h index 93157db58..e348be57d 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h +++ b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h @@ -400,8 +400,7 @@ extern unsigned int custom_rand_generate(void); #undef NO_DES3 #define NO_DES3 -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/Renesas/cs+/Projects/common/user_settings.h b/IDE/Renesas/cs+/Projects/common/user_settings.h index 3d923a2cf..c05fb4013 100644 --- a/IDE/Renesas/cs+/Projects/common/user_settings.h +++ b/IDE/Renesas/cs+/Projects/common/user_settings.h @@ -61,7 +61,7 @@ /*#define WOLFSSL_CMSIS_RTOS */ /* #define NO_DH */ -#define NO_RC4 + #define HAVE_AESGCM #define WOLFSSL_SHA512 #define WOLFSSL_SHA384 diff --git a/IDE/Renesas/e2studio/RA6M3/common/user_settings.h b/IDE/Renesas/e2studio/RA6M3/common/user_settings.h index 6adee0053..1f881f51a 100644 --- a/IDE/Renesas/e2studio/RA6M3/common/user_settings.h +++ b/IDE/Renesas/e2studio/RA6M3/common/user_settings.h @@ -74,7 +74,7 @@ #define NO_PWDBASED #define NO_DSA #define NO_DES3 -#define NO_RC4 + #define NO_MD4 void wolfssl_thread_entry(void *pvParameters); diff --git a/IDE/STARCORE/user_settings.h b/IDE/STARCORE/user_settings.h index 29a238966..7f672a1fc 100644 --- a/IDE/STARCORE/user_settings.h +++ b/IDE/STARCORE/user_settings.h @@ -583,8 +583,7 @@ extern "C" { #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/SimplicityStudio/user_settings.h b/IDE/SimplicityStudio/user_settings.h index 3e6fb09c8..4bd7fdd06 100644 --- a/IDE/SimplicityStudio/user_settings.h +++ b/IDE/SimplicityStudio/user_settings.h @@ -507,7 +507,7 @@ extern "C" { #define NO_PSK #define NO_DSA -#define NO_RC4 + #define NO_MD4 #define NO_PWDBASED //#define NO_CODING diff --git a/IDE/VS-ARM/user_settings.h b/IDE/VS-ARM/user_settings.h index 3490252c1..5191c4cd8 100644 --- a/IDE/VS-ARM/user_settings.h +++ b/IDE/VS-ARM/user_settings.h @@ -14,7 +14,7 @@ #define USE_FAST_MATH #define TFM_TIMING_RESISTANT #define ECC_TIMING_RESISTANT -#define NO_RC4 + #define NO_DSA #define NO_MD4 #define HAVE_ECC diff --git a/IDE/VS-AZURE-SPHERE/user_settings.h b/IDE/VS-AZURE-SPHERE/user_settings.h index a55c0b091..730affbaa 100644 --- a/IDE/VS-AZURE-SPHERE/user_settings.h +++ b/IDE/VS-AZURE-SPHERE/user_settings.h @@ -48,7 +48,7 @@ #define NO_PWDBASED #define NO_DSA #define NO_DES3 -#define NO_RC4 + #define NO_MD4 /* Benchmark / Testing */ diff --git a/IDE/VisualDSP/user_settings.h b/IDE/VisualDSP/user_settings.h index 4730ebc94..4a1b59ed7 100644 --- a/IDE/VisualDSP/user_settings.h +++ b/IDE/VisualDSP/user_settings.h @@ -628,8 +628,7 @@ extern "C" { #undef NO_DSA //#define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS //#define NO_OLD_TLS diff --git a/IDE/WICED-STUDIO/user_settings.h b/IDE/WICED-STUDIO/user_settings.h index b57563b8e..2a4eb9fb4 100644 --- a/IDE/WICED-STUDIO/user_settings.h +++ b/IDE/WICED-STUDIO/user_settings.h @@ -661,8 +661,7 @@ extern unsigned int my_rng_seed_gen(void); #undef NO_DSA //#define NO_DSA -#undef NO_RC4 -//#define NO_RC4 + #undef NO_OLD_TLS //#define NO_OLD_TLS diff --git a/IDE/WIN-SRTP-KDF-140-3/user_settings.h b/IDE/WIN-SRTP-KDF-140-3/user_settings.h index e9e6090e0..1e13ede2f 100644 --- a/IDE/WIN-SRTP-KDF-140-3/user_settings.h +++ b/IDE/WIN-SRTP-KDF-140-3/user_settings.h @@ -53,7 +53,7 @@ #define WOLFSSL_SHA384 #define WOLFSSL_SHA512 #define NO_PSK - #define NO_RC4 + #define NO_DSA #define NO_MD4 diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h index a1011abf8..238405866 100644 --- a/IDE/WIN/user_settings.h +++ b/IDE/WIN/user_settings.h @@ -27,7 +27,7 @@ #define WOLFSSL_SHA384 #define WOLFSSL_SHA512 #define NO_PSK - #define NO_RC4 + #define NO_DSA #define NO_MD4 diff --git a/IDE/WIN/user_settings_dtls.h b/IDE/WIN/user_settings_dtls.h index ff6f3ac1e..97d946395 100644 --- a/IDE/WIN/user_settings_dtls.h +++ b/IDE/WIN/user_settings_dtls.h @@ -31,7 +31,7 @@ #define WOLFSSL_SHA384 #define WOLFSSL_SHA512 #define NO_PSK - #define NO_RC4 + #define NO_DSA #define NO_MD4 diff --git a/IDE/WIN10/user_settings.h b/IDE/WIN10/user_settings.h index 1fcb31731..cda4df037 100644 --- a/IDE/WIN10/user_settings.h +++ b/IDE/WIN10/user_settings.h @@ -49,7 +49,7 @@ #define WOLFSSL_SHA384 #define WOLFSSL_SHA512 #define NO_PSK - #define NO_RC4 + #define NO_DSA #define NO_MD4 diff --git a/IDE/WINCE/user_settings.h b/IDE/WINCE/user_settings.h index f9a7e940b..f4dc71757 100644 --- a/IDE/WINCE/user_settings.h +++ b/IDE/WINCE/user_settings.h @@ -766,8 +766,7 @@ extern "C" { #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h index 7383ee435..709bfc8ac 100644 --- a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h +++ b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h @@ -633,8 +633,7 @@ extern "C" { #undef NO_DSA //#define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS /* dependency on MD5, enable MD5 if this setting disabled */ diff --git a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h index 55e3b487a..9c9c224b2 100644 --- a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h +++ b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h @@ -644,8 +644,7 @@ extern "C" { #undef NO_DSA //#define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS /* dependency on MD5, enable MD5 if this setting disabled */ diff --git a/IDE/XCODE-FIPSv2/user_settings.h b/IDE/XCODE-FIPSv2/user_settings.h index f71dc2fa3..3c909b91d 100644 --- a/IDE/XCODE-FIPSv2/user_settings.h +++ b/IDE/XCODE-FIPSv2/user_settings.h @@ -645,8 +645,7 @@ extern "C" { #undef NO_DSA //#define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/XCODE-FIPSv5/user_settings.h b/IDE/XCODE-FIPSv5/user_settings.h index 4e1e420c3..3c445a3c1 100644 --- a/IDE/XCODE-FIPSv5/user_settings.h +++ b/IDE/XCODE-FIPSv5/user_settings.h @@ -777,8 +777,7 @@ extern "C" { #undef NO_DSA #define NO_DSA -#undef NO_RC4 -#define NO_RC4 + #undef NO_OLD_TLS #define NO_OLD_TLS diff --git a/IDE/XCODE/user_settings.h b/IDE/XCODE/user_settings.h index 5ac0b5c3f..63c2e3f13 100644 --- a/IDE/XCODE/user_settings.h +++ b/IDE/XCODE/user_settings.h @@ -65,7 +65,7 @@ #define HAVE_EXTENDED_MASTER /* off by default */ - #define NO_RC4 + #define NO_MD4 #define NO_DSA #define NO_PSK diff --git a/IDE/XilinxSDK/user_settings.h b/IDE/XilinxSDK/user_settings.h index d49d0eed8..2482c4fd8 100644 --- a/IDE/XilinxSDK/user_settings.h +++ b/IDE/XilinxSDK/user_settings.h @@ -151,7 +151,7 @@ extern unsigned char my_rng_seed_gen(void); /* Disable Algorithms */ #define NO_DSA -#define NO_RC4 + #define NO_MD4 #define NO_MD5 #define NO_SHA diff --git a/IDE/iotsafe/user_settings.h b/IDE/iotsafe/user_settings.h index 6bf474415..16f470d9e 100644 --- a/IDE/iotsafe/user_settings.h +++ b/IDE/iotsafe/user_settings.h @@ -177,7 +177,7 @@ static inline long XTIME(long *x) { return jiffies;} /* Disable Algorithms */ #define NO_DES3 #define NO_DSA -#define NO_RC4 + #define NO_MD4 #define NO_MD5 #define NO_SHA