diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fa246dc9..59dc978a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -902,16 +902,6 @@ endif() # - Web server # - Web client -# HC128 -set(WOLFSSL_HC128_HELP_STRING "Enable HC-128 (default: disabled)") -add_option("WOLFSSL_HC128" ${WOLFSSL_HC128_HELP_STRING} "no" "yes;no") - -if(NOT WOLFSSL_HC128) - list(APPEND WOLFSSL_DEFINITIONS "-DNO_HC128") -else() - list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_HC128") -endif() - # RABBIT if(NOT WOLFSSL_RABBIT) list(APPEND WOLFSSL_DEFINITIONS "-DNO_RABBIT") diff --git a/IDE/Android/Android.bp b/IDE/Android/Android.bp index f65ab5294..646efb051 100644 --- a/IDE/Android/Android.bp +++ b/IDE/Android/Android.bp @@ -73,7 +73,6 @@ cc_library_shared { "./wolfcrypt/src/ge_operations.c", "./wolfcrypt/src/hash.c", "./wolfcrypt/src/kdf.c", - "./wolfcrypt/src/hc128.c", "./wolfcrypt/src/hmac.c", "./wolfcrypt/src/idea.c", "./wolfcrypt/src/integer.c", diff --git a/IDE/Android/user_settings.h b/IDE/Android/user_settings.h index aa43d9f89..3e2bd9056 100644 --- a/IDE/Android/user_settings.h +++ b/IDE/Android/user_settings.h @@ -122,7 +122,6 @@ #define NO_DSA #define NO_RC4 -#define NO_HC128 #define NO_RABBIT #define NO_RC4 #define NO_PSK diff --git a/IDE/CRYPTOCELL/user_settings.h b/IDE/CRYPTOCELL/user_settings.h index 380422d23..fc03a0367 100644 --- a/IDE/CRYPTOCELL/user_settings.h +++ b/IDE/CRYPTOCELL/user_settings.h @@ -558,9 +558,6 @@ extern "C" { #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/ECLIPSE/DEOS/deos_wolfssl/.project b/IDE/ECLIPSE/DEOS/deos_wolfssl/.project index 05b86a93a..ace340762 100644 --- a/IDE/ECLIPSE/DEOS/deos_wolfssl/.project +++ b/IDE/ECLIPSE/DEOS/deos_wolfssl/.project @@ -424,11 +424,6 @@ 1 WOLFSSL_ROOT/wolfcrypt/src/hash.c - - wolfcrypt/src/hc128.c - 1 - WOLFSSL_ROOT/wolfcrypt/src/hc128.c - wolfcrypt/src/hmac.c 1 diff --git a/IDE/ECLIPSE/MICRIUM/README.md b/IDE/ECLIPSE/MICRIUM/README.md index 7f5c81d4d..009931cb2 100644 --- a/IDE/ECLIPSE/MICRIUM/README.md +++ b/IDE/ECLIPSE/MICRIUM/README.md @@ -93,7 +93,6 @@ HMAC-SHA test passed! HAC-SHA256 test passed! HMAC-SHA512 test passed! GMC test passed! -HC-128 test passed! Rabbit test passed! DS test passed! DS3 test passed! diff --git a/IDE/ECLIPSE/RTTHREAD/README.md b/IDE/ECLIPSE/RTTHREAD/README.md index e329aff57..ff311f259 100644 --- a/IDE/ECLIPSE/RTTHREAD/README.md +++ b/IDE/ECLIPSE/RTTHREAD/README.md @@ -93,7 +93,6 @@ HMAC-SHA512 test passed! X963-KDF test passed! GMAC test passed! ARC4 test passed! -HC-128 test passed! Rabbit test passed! DES test passed! DES3 test passed! @@ -172,4 +171,4 @@ ED 25519 verify 2 ops took 1.000 sec, avg 500.000 ms, 2.000 ops/sec ## References -For more information please contact info@wolfssl.com. \ No newline at end of file +For more information please contact info@wolfssl.com. diff --git a/IDE/GCC-ARM/Header/user_settings.h b/IDE/GCC-ARM/Header/user_settings.h index 1496866b1..301605295 100644 --- a/IDE/GCC-ARM/Header/user_settings.h +++ b/IDE/GCC-ARM/Header/user_settings.h @@ -610,9 +610,6 @@ extern unsigned int my_rng_seed_gen(void); #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/GCC-ARM/Makefile.common b/IDE/GCC-ARM/Makefile.common index 2687a4b3c..61ec15f93 100644 --- a/IDE/GCC-ARM/Makefile.common +++ b/IDE/GCC-ARM/Makefile.common @@ -182,7 +182,6 @@ SRC_C += ../../wolfcrypt/src/arc4.c SRC_C += ../../wolfcrypt/src/blake2b.c SRC_C += ../../wolfcrypt/src/camellia.c SRC_C += ../../wolfcrypt/src/dsa.c -SRC_C += ../../wolfcrypt/src/hc128.c SRC_C += ../../wolfcrypt/src/idea.c SRC_C += ../../wolfcrypt/src/md2.c SRC_C += ../../wolfcrypt/src/md4.c diff --git a/IDE/HEXAGON/Makefile b/IDE/HEXAGON/Makefile index 11dea412b..4f0e0aed9 100644 --- a/IDE/HEXAGON/Makefile +++ b/IDE/HEXAGON/Makefile @@ -118,7 +118,6 @@ libwolfssl_C_SRCS += \ ../../wolfcrypt/src/wc_encrypt \ ../../wolfcrypt/src/hash \ ../../wolfcrypt/src/wc_pkcs11 \ - ../../wolfcrypt/src/hc128 \ ../../wolfcrypt/src/wc_port \ ../../wolfcrypt/src/hmac \ ../../wolfcrypt/src/wolfcrypt_first \ diff --git a/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp b/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp index f8320e199..38dd5d2c3 100644 --- a/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp +++ b/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp @@ -1978,9 +1978,6 @@ $PROJ_DIR$\..\..\..\..\wolfcrypt\src\kdf.c - - $PROJ_DIR$\..\..\..\..\wolfcrypt\src\hc128.c - $PROJ_DIR$\..\..\..\..\wolfcrypt\src\hmac.c diff --git a/IDE/IAR-EWARM/embOS/custom_port/README_custom_port b/IDE/IAR-EWARM/embOS/custom_port/README_custom_port index 643bc6177..70d5d3e1d 100644 --- a/IDE/IAR-EWARM/embOS/custom_port/README_custom_port +++ b/IDE/IAR-EWARM/embOS/custom_port/README_custom_port @@ -173,7 +173,6 @@ HMAC-SHA256 test passed! HMAC-SHA384 test passed! HMAC-SHA512 test passed! GMAC test passed! -HC-128 test passed! Rabbit test passed! Chacha test passed! POLY1305 test passed! diff --git a/IDE/INTIME-RTOS/libwolfssl.vcxproj b/IDE/INTIME-RTOS/libwolfssl.vcxproj index ca7360756..c7c721094 100755 --- a/IDE/INTIME-RTOS/libwolfssl.vcxproj +++ b/IDE/INTIME-RTOS/libwolfssl.vcxproj @@ -47,7 +47,6 @@ - @@ -114,7 +113,6 @@ - diff --git a/IDE/INTIME-RTOS/user_settings.h b/IDE/INTIME-RTOS/user_settings.h index 529dad4d1..874c4ca27 100644 --- a/IDE/INTIME-RTOS/user_settings.h +++ b/IDE/INTIME-RTOS/user_settings.h @@ -418,9 +418,6 @@ extern "C" { #undef NO_RC4 #define NO_RC4 -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/KDS/.project b/IDE/KDS/.project index 90424c9c7..da462e7c3 100644 --- a/IDE/KDS/.project +++ b/IDE/KDS/.project @@ -170,11 +170,6 @@ 1 PARENT-2-PROJECT_LOC/wolfcrypt/src/kdf.c - - src/wolfcrypt-src/hc128.c - 1 - PARENT-2-PROJECT_LOC/wolfcrypt/src/hc128.c - src/wolfcrypt-src/hmac.c 1 diff --git a/IDE/LINUX-SGX/sgx_t_static.mk b/IDE/LINUX-SGX/sgx_t_static.mk index 891350a78..bd85adad5 100644 --- a/IDE/LINUX-SGX/sgx_t_static.mk +++ b/IDE/LINUX-SGX/sgx_t_static.mk @@ -62,7 +62,6 @@ Wolfssl_C_Files :=$(WOLFSSL_ROOT)/wolfcrypt/src/aes.c\ $(WOLFSSL_ROOT)/wolfcrypt/src/error.c\ $(WOLFSSL_ROOT)/wolfcrypt/src/hash.c\ $(WOLFSSL_ROOT)/wolfcrypt/src/kdf.c\ - $(WOLFSSL_ROOT)/wolfcrypt/src/hc128.c\ $(WOLFSSL_ROOT)/wolfcrypt/src/hmac.c\ $(WOLFSSL_ROOT)/wolfcrypt/src/integer.c\ $(WOLFSSL_ROOT)/src/internal.c\ diff --git a/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h b/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h index 9189410a5..e9013e359 100644 --- a/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h +++ b/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h @@ -46,7 +46,6 @@ #define NO_DEV_RANDOM #define NO_MD4 #define NO_RABBIT -#define NO_HC128 #define NO_DSA #define NO_PWDBASED #define NO_PSK diff --git a/IDE/M68K/user_settings.h b/IDE/M68K/user_settings.h index 25ee6bcef..43836f04b 100644 --- a/IDE/M68K/user_settings.h +++ b/IDE/M68K/user_settings.h @@ -48,7 +48,6 @@ #define NO_ASN_TIME #define NO_PWDBASED -#define NO_HC128 #define NO_RABBIT #define NO_RC4 #define NO_DSA 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 745b78399..73c6e4244 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h @@ -138,12 +138,6 @@ #define NO_HMAC #endif // -// HC128 -#define MDK_CONF_HC128 0 -#if MDK_CONF_HC128 == 1 -#define HAVE_HC128 -#endif -// // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBI == 0 diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h index 6275972fb..2b05a062e 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h @@ -175,12 +175,6 @@ #define NO_HMAC #endif // -// HC128 -#define MDK_CONF_HC128 0 -#if MDK_CONF_HC128 == 1 -#define HAVE_HC128 -#endif -// // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBI == 0 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 7e31d13a1..f424080e2 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 @@ -197,12 +197,6 @@ #define NO_HMAC #endif // -// HC128 -#define MDK_CONF_HC128 0 -#if MDK_CONF_HC128 == 1 -#define HAVE_HC128 -#endif -// // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBI == 0 diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c index 0b8bf4063..54db7a90c 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c @@ -145,10 +145,6 @@ extern void hmac_sha384_test(void *arg) ; extern void arc4_test(void *arg) ; #endif -#ifndef NO_HC128 -extern void hc128_test(void *arg) ; -#endif - #ifndef NO_RABBIT extern void rabbit_test(void *arg) ; #endif @@ -267,9 +263,6 @@ static struct { #ifndef NO_RC4 "arc4", arc4_test, #endif -#ifndef NO_HC128 - "hc128", hc128_test, -#endif #ifndef NO_RABBIT "rabbit", rabbit_test, #endif diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt index 250dbb517..f55ac32d0 100644 --- a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt +++ b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt @@ -843,19 +843,6 @@ 0 0 - - 1 - 22 - 1 - 0 - 0 - 0 - 0 - ..\..\..\wolfcrypt\src\hc128.c - hc128.c - 0 - 0 - 1 23 diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj index a97cea8c2..a27958218 100644 --- a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj +++ b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj @@ -511,11 +511,6 @@ 1 ..\..\..\wolfcrypt\src\ge_operations.c - - hc128.c - 1 - ..\..\..\wolfcrypt\src\hc128.c - hmac.c 1 @@ -1225,11 +1220,6 @@ 1 ..\..\..\wolfcrypt\src\ge_operations.c - - hc128.c - 1 - ..\..\..\wolfcrypt\src\hc128.c - hmac.c 1 @@ -1939,11 +1929,6 @@ 1 ..\..\..\wolfcrypt\src\ge_operations.c - - hc128.c - 1 - ..\..\..\wolfcrypt\src\hc128.c - hmac.c 1 diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h index 5b83f556d..a84c4f231 100644 --- a/IDE/MDK5-ARM/Conf/user_settings.h +++ b/IDE/MDK5-ARM/Conf/user_settings.h @@ -245,13 +245,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h index c0dbb1894..35c629b4b 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h @@ -245,13 +245,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h index 5c77fe125..35a8b7b01 100644 --- a/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h @@ -245,13 +245,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MDK5-ARM/Projects/EchoClient/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/EchoClient/RTE/wolfSSL/user_settings.h index 1706c1b82..eb6f08b36 100644 --- a/IDE/MDK5-ARM/Projects/EchoClient/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/EchoClient/RTE/wolfSSL/user_settings.h @@ -243,13 +243,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MDK5-ARM/Projects/EchoServer/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/EchoServer/RTE/wolfSSL/user_settings.h index a47879058..8a27cb18d 100644 --- a/IDE/MDK5-ARM/Projects/EchoServer/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/EchoServer/RTE/wolfSSL/user_settings.h @@ -245,13 +245,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/SimpleClient/RTE/wolfSSL/user_settings.h index f4519b1d6..26be27dd5 100644 --- a/IDE/MDK5-ARM/Projects/SimpleClient/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/SimpleClient/RTE/wolfSSL/user_settings.h @@ -245,13 +245,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/SimpleServer/RTE/wolfSSL/user_settings.h index f4519b1d6..26be27dd5 100644 --- a/IDE/MDK5-ARM/Projects/SimpleServer/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/SimpleServer/RTE/wolfSSL/user_settings.h @@ -245,13 +245,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c b/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c index 489665e9a..af6d389ea 100644 --- a/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c +++ b/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c @@ -152,10 +152,6 @@ extern void hmac_sha384_test(void *arg) ; extern void arc4_test(void *arg) ; #endif -#ifndef NO_HC128 -extern void hc128_test(void *arg) ; -#endif - #ifndef NO_RABBIT extern void rabbit_test(void *arg) ; #endif @@ -274,9 +270,6 @@ static struct { #ifndef NO_RC4 "arc4", arc4_test, #endif -#ifndef NO_HC128 - "hc128", hc128_test, -#endif #ifndef NO_RABBIT "rabbit", rabbit_test, #endif diff --git a/IDE/MDK5-ARM/Projects/wolfSSL-Lib/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/wolfSSL-Lib/RTE/wolfSSL/user_settings.h index f4519b1d6..26be27dd5 100644 --- a/IDE/MDK5-ARM/Projects/wolfSSL-Lib/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/wolfSSL-Lib/RTE/wolfSSL/user_settings.h @@ -245,13 +245,6 @@ #endif // -// HC128 -#define MDK_CONF_HC128 1 -#if MDK_CONF_HC128 == 0 -#define NO_HC128 -#endif -// - // RABBIT #define MDK_CONF_RABBIT 1 #if MDK_CONF_RABBIT == 0 diff --git a/IDE/MQX/Makefile b/IDE/MQX/Makefile index 3ee997700..7d0ac5dbb 100644 --- a/IDE/MQX/Makefile +++ b/IDE/MQX/Makefile @@ -98,7 +98,6 @@ $(WOLF_ROOT)/wolfcrypt/src/fe_operations.o\ $(WOLF_ROOT)/wolfcrypt/src/ge_low_mem.o\ $(WOLF_ROOT)/wolfcrypt/src/ge_operations.o\ $(WOLF_ROOT)/wolfcrypt/src/hash.o\ -$(WOLF_ROOT)/wolfcrypt/src/hc128.o\ $(WOLF_ROOT)/wolfcrypt/src/hmac.o\ $(WOLF_ROOT)/wolfcrypt/src/idea.o\ $(WOLF_ROOT)/wolfcrypt/src/integer.o\ diff --git a/IDE/MQX/user_settings.h b/IDE/MQX/user_settings.h index e229a26dc..a27ddcaf3 100644 --- a/IDE/MQX/user_settings.h +++ b/IDE/MQX/user_settings.h @@ -34,7 +34,6 @@ #define WC_RSA_PSS #define WOLFSSL_BASE64_ENCODE #define NO_RC4 -#define NO_HC128 #define NO_RABBIT #define WOLFSSL_SHA224 #define WOLFSSL_SHA3 diff --git a/IDE/MYSQL/CMakeLists_wolfCrypt.txt b/IDE/MYSQL/CMakeLists_wolfCrypt.txt index 01a66b419..d6ac32f50 100644 --- a/IDE/MYSQL/CMakeLists_wolfCrypt.txt +++ b/IDE/MYSQL/CMakeLists_wolfCrypt.txt @@ -27,14 +27,14 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS(${SSL_DEFINES}) SET(WOLFCRYPT_SOURCES src/aes.c src/arc4.c src/asn.c src/blake2b.c src/camellia.c src/chacha.c src/coding.c src/compress.c src/des3.c - src/dh.c src/dsa.c src/ecc.c src/error.c src/hc128.c src/hmac.c + src/dh.c src/dsa.c src/ecc.c src/error.c src/hmac.c src/integer.c src/kdf.c src/logging.c src/md2.c src/md4.c src/md5.c src/memory.c src/pkcs7.c src/pkcs12.c src/poly1305.c src/pwdbased.c src/rabbit.c src/random.c src/ripemd.c src/rsa.c src/sha.c src/sha256.c src/sha512.c src/tfm.c src/wc_port.c src/wc_encrypt.c src/hash.c src/wolfmath.c ../wolfssl/wolfcrypt/aes.h ../wolfssl/wolfcrypt/arc4.h ../wolfssl/wolfcrypt/asn.h ../wolfssl/wolfcrypt/blake2.h ../wolfssl/wolfcrypt/camellia.h ../wolfssl/wolfcrypt/chacha.h ../wolfssl/wolfcrypt/coding.h ../wolfssl/wolfcrypt/compress.h ../wolfssl/wolfcrypt/des3.h - ../wolfssl/wolfcrypt/dh.h ../wolfssl/wolfcrypt/dsa.h ../wolfssl/wolfcrypt/ecc.h ../wolfssl/wolfcrypt/error-crypt.h ../wolfssl/wolfcrypt/hc128.h ../wolfssl/wolfcrypt/hmac.h + ../wolfssl/wolfcrypt/dh.h ../wolfssl/wolfcrypt/dsa.h ../wolfssl/wolfcrypt/ecc.h ../wolfssl/wolfcrypt/error-crypt.h ../wolfssl/wolfcrypt/hmac.h ../wolfssl/wolfcrypt/integer.h ../wolfssl/wolfcrypt/logging.h ../wolfssl/wolfcrypt/md2.h ../wolfssl/wolfcrypt/md4.h ../wolfssl/wolfcrypt/md5.h ../wolfssl/wolfcrypt/memory.h ../wolfssl/wolfcrypt/misc.h ../wolfssl/wolfcrypt/pkcs7.h ../wolfssl/wolfcrypt/poly1305.h ../wolfssl/wolfcrypt/pwdbased.h ../wolfssl/wolfcrypt/rabbit.h ../wolfssl/wolfcrypt/random.h ../wolfssl/wolfcrypt/ripemd.h ../wolfssl/wolfcrypt/rsa.h ../wolfssl/wolfcrypt/sha.h ../wolfssl/wolfcrypt/sha256.h ../wolfssl/wolfcrypt/sha512.h diff --git a/IDE/NETOS/user_settings.h b/IDE/NETOS/user_settings.h index eef489737..bde6f8592 100644 --- a/IDE/NETOS/user_settings.h +++ b/IDE/NETOS/user_settings.h @@ -578,9 +578,6 @@ extern "C" { #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/NETOS/user_settings.h-cert2425 b/IDE/NETOS/user_settings.h-cert2425 index bc6ffa6a9..7c6aea9bd 100644 --- a/IDE/NETOS/user_settings.h-cert2425 +++ b/IDE/NETOS/user_settings.h-cert2425 @@ -45,7 +45,6 @@ #define ECC_SHAMIR #define WOLFSSL_BASE64_ENCODE #define NO_RC4 - #define NO_HC128 #define NO_RABBIT #define HAVE_HASHDRBG #define HAVE_TLS_EXTENSIONS @@ -107,7 +106,6 @@ #define ECC_SHAMIR #define WOLFSSL_BASE64_ENCODE #define NO_RC4 - #define NO_HC128 #define NO_RABBIT #define HAVE_HASHDRBG #define HAVE_TLS_EXTENSIONS diff --git a/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h b/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h index b70cb2624..ca3fbdd30 100644 --- a/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h +++ b/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h @@ -558,9 +558,6 @@ extern "C" { #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h index fcf576645..d616a8c01 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h +++ b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h @@ -407,9 +407,6 @@ extern unsigned int custom_rand_generate(void); #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp index 2706be5f8..d090f65b7 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp +++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp @@ -72,7 +72,6 @@ - diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp index 81ecc568a..9d24820f3 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp +++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp @@ -74,7 +74,6 @@ - diff --git a/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj b/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj index b9f027b46..31aeca0b3 100644 --- a/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj +++ b/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj @@ -273,13 +273,6 @@ 941832c1-fc3b-4e1b-94e8-01ea17128b42 2170607d-803e-45b0-80af-6507d495a8de - - hc128.c - File - ..\..\..\..\..\wolfcrypt\src\hc128.c - 941832c1-fc3b-4e1b-94e8-01ea17128b42 - 2170607d-803e-45b0-80af-6507d495a8de - hmac.c File diff --git a/IDE/Renesas/e2studio/Projects/wolfssl/.project b/IDE/Renesas/e2studio/Projects/wolfssl/.project index a2f1351e7..a46643599 100644 --- a/IDE/Renesas/e2studio/Projects/wolfssl/.project +++ b/IDE/Renesas/e2studio/Projects/wolfssl/.project @@ -219,11 +219,6 @@ 1 PARENT-5-PROJECT_LOC/wolfcrypt/src/kdf.c - - wolfcrypt/src/hc128.c - 1 - PARENT-5-PROJECT_LOC/wolfcrypt/src/hc128.c - wolfcrypt/src/hmac.c 1 diff --git a/IDE/Renesas/e2studio/RA6M3/wolfssl/.project b/IDE/Renesas/e2studio/RA6M3/wolfssl/.project index f8d55d06d..25598c449 100644 --- a/IDE/Renesas/e2studio/RA6M3/wolfssl/.project +++ b/IDE/Renesas/e2studio/RA6M3/wolfssl/.project @@ -215,11 +215,6 @@ 1 PARENT-5-PROJECT_LOC/wolfcrypt/src/hash.c - - wolfcrypt/hc128.c - 1 - PARENT-5-PROJECT_LOC/wolfcrypt/src/hc128.c - wolfcrypt/hmac.c 1 diff --git a/IDE/Renesas/e2studio/RA6M4/wolfssl/.project b/IDE/Renesas/e2studio/RA6M4/wolfssl/.project index 9dc12ee0b..880a4e898 100644 --- a/IDE/Renesas/e2studio/RA6M4/wolfssl/.project +++ b/IDE/Renesas/e2studio/RA6M4/wolfssl/.project @@ -166,11 +166,6 @@ 1 PARENT-5-PROJECT_LOC/wolfcrypt/src/hash.c - - wolfCrypt/hc128.c - 1 - PARENT-5-PROJECT_LOC/wolfcrypt/src/hc128.c - wolfCrypt/hmac.c 1 diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/.project b/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/.project index 062ba096d..a305ba05b 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/.project +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/.project @@ -219,11 +219,6 @@ 1 PARENT-6-PROJECT_LOC/wolfcrypt/src/hash.c - - wolfcrypt/src/hc128.c - 1 - PARENT-6-PROJECT_LOC/wolfcrypt/src/hc128.c - wolfcrypt/src/hmac.c 1 diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/wolfssl.rcpc b/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/wolfssl.rcpc index 27734f4da..4bd622a5c 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/wolfssl.rcpc +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/wolfssl/wolfssl.rcpc @@ -52,7 +52,6 @@ ..\..\..\..\..\..\wolfcrypt\src\ge_low_mem.c ..\..\..\..\..\..\wolfcrypt\src\ge_operations.c ..\..\..\..\..\..\wolfcrypt\src\hash.c - ..\..\..\..\..\..\wolfcrypt\src\hc128.c ..\..\..\..\..\..\wolfcrypt\src\hmac.c ..\..\..\..\..\..\wolfcrypt\src\idea.c ..\..\..\..\..\..\wolfcrypt\src\integer.c @@ -169,7 +168,6 @@ Debug\ge_low_mem.obj Debug\ge_operations.obj Debug\hash.obj - Debug\hc128.obj Debug\hmac.obj Debug\idea.obj Debug\integer.obj diff --git a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.project b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.project index b97788fd0..6c3300dd1 100644 --- a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.project +++ b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.project @@ -219,11 +219,6 @@ 1 PARENT-6-PROJECT_LOC/wolfcrypt/src/hash.c - - wolfcrypt/src/hc128.c - 1 - PARENT-6-PROJECT_LOC/wolfcrypt/src/hc128.c - wolfcrypt/src/hmac.c 1 diff --git a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc index 042906520..2f558c409 100644 --- a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc +++ b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc @@ -52,7 +52,6 @@ ..\..\..\..\..\..\wolfcrypt\src\ge_low_mem.c ..\..\..\..\..\..\wolfcrypt\src\ge_operations.c ..\..\..\..\..\..\wolfcrypt\src\hash.c - ..\..\..\..\..\..\wolfcrypt\src\hc128.c ..\..\..\..\..\..\wolfcrypt\src\hmac.c ..\..\..\..\..\..\wolfcrypt\src\idea.c ..\..\..\..\..\..\wolfcrypt\src\integer.c @@ -174,7 +173,6 @@ Debug\ge_low_mem.obj Debug\ge_operations.obj Debug\hash.obj - Debug\hc128.obj Debug\hmac.obj Debug\idea.obj Debug\integer.obj diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject index 39d22a2b2..cc8693c4c 100644 --- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject +++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject @@ -106,7 +106,6 @@ - @@ -175,4 +174,4 @@ - \ No newline at end of file + diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.project b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.project index b97788fd0..6c3300dd1 100644 --- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.project +++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.project @@ -219,11 +219,6 @@ 1 PARENT-6-PROJECT_LOC/wolfcrypt/src/hash.c - - wolfcrypt/src/hc128.c - 1 - PARENT-6-PROJECT_LOC/wolfcrypt/src/hc128.c - wolfcrypt/src/hmac.c 1 diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc index 2f2a6ad59..49f8e4011 100644 --- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc +++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc @@ -52,7 +52,6 @@ ..\..\..\..\..\..\wolfcrypt\src\ge_low_mem.c ..\..\..\..\..\..\wolfcrypt\src\ge_operations.c ..\..\..\..\..\..\wolfcrypt\src\hash.c - ..\..\..\..\..\..\wolfcrypt\src\hc128.c ..\..\..\..\..\..\wolfcrypt\src\hmac.c ..\..\..\..\..\..\wolfcrypt\src\idea.c ..\..\..\..\..\..\wolfcrypt\src\integer.c @@ -169,7 +168,6 @@ Debug\ge_low_mem.obj Debug\ge_operations.obj Debug\hash.obj - Debug\hc128.obj Debug\hmac.obj Debug\idea.obj Debug\integer.obj diff --git a/IDE/STM32Cube/default_conf.ftl b/IDE/STM32Cube/default_conf.ftl index 8cfbc121a..ef5509159 100644 --- a/IDE/STM32Cube/default_conf.ftl +++ b/IDE/STM32Cube/default_conf.ftl @@ -549,7 +549,6 @@ extern ${variable.value} ${variable.name}; #define NO_DSA #define NO_RC4 -#define NO_HC128 #define NO_RABBIT #define NO_MD4 #define NO_DES3 diff --git a/IDE/VS-ARM/user_settings.h b/IDE/VS-ARM/user_settings.h index a17bb8599..16fc59b91 100644 --- a/IDE/VS-ARM/user_settings.h +++ b/IDE/VS-ARM/user_settings.h @@ -14,7 +14,6 @@ #define USE_FAST_MATH #define TFM_TIMING_RESISTANT #define ECC_TIMING_RESISTANT -#define NO_HC128 #define NO_RC4 #define NO_RABBIT #define NO_DSA diff --git a/IDE/VS-ARM/wolfssl.vcxproj b/IDE/VS-ARM/wolfssl.vcxproj index 561aa76c2..ace63bc07 100644 --- a/IDE/VS-ARM/wolfssl.vcxproj +++ b/IDE/VS-ARM/wolfssl.vcxproj @@ -64,7 +64,6 @@ - diff --git a/IDE/VS-AZURE-SPHERE/wolfssl.vcxproj b/IDE/VS-AZURE-SPHERE/wolfssl.vcxproj index 752a96ce9..7301bcfd0 100644 --- a/IDE/VS-AZURE-SPHERE/wolfssl.vcxproj +++ b/IDE/VS-AZURE-SPHERE/wolfssl.vcxproj @@ -43,7 +43,6 @@ - diff --git a/IDE/VisualDSP/user_settings.h b/IDE/VisualDSP/user_settings.h index d4fbdbfd1..83b32b79d 100644 --- a/IDE/VisualDSP/user_settings.h +++ b/IDE/VisualDSP/user_settings.h @@ -635,9 +635,6 @@ extern "C" { #undef NO_OLD_TLS //#define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/WICED-STUDIO/user_settings.h b/IDE/WICED-STUDIO/user_settings.h index 70e13959f..eaf7541e4 100644 --- a/IDE/WICED-STUDIO/user_settings.h +++ b/IDE/WICED-STUDIO/user_settings.h @@ -667,9 +667,6 @@ extern unsigned int my_rng_seed_gen(void); #undef NO_OLD_TLS //#define NO_OLD_TLS -#undef NO_HC128 -//#define NO_HC128 - #undef NO_RABBIT //#define NO_RABBIT diff --git a/IDE/WIN/README.txt b/IDE/WIN/README.txt index 7dfadc789..00cac6045 100644 --- a/IDE/WIN/README.txt +++ b/IDE/WIN/README.txt @@ -54,7 +54,6 @@ The default build options should be the proper default set of options: * HAVE_HASHDRBG * WOLFSSL_SHA384 * WOLFSSL_SHA512 - * NO_HC128 * NO_RC4 * NO_RABBIT * NO_DSA diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h index 8152b1def..3ba5e3ddc 100644 --- a/IDE/WIN/user_settings.h +++ b/IDE/WIN/user_settings.h @@ -17,7 +17,6 @@ #define WOLFSSL_SHA384 #define WOLFSSL_SHA512 #define NO_PSK - #define NO_HC128 #define NO_RC4 #define NO_RABBIT #define NO_DSA diff --git a/IDE/WIN10/README.txt b/IDE/WIN10/README.txt index 5820228bb..4c0b5730d 100644 --- a/IDE/WIN10/README.txt +++ b/IDE/WIN10/README.txt @@ -57,7 +57,6 @@ The default build options should be the proper default set of options: * WOLFSSL_SHA384 * WOLFSSL_SHA512 * NO_PSK - * NO_HC128 * NO_RC4 * NO_RABBIT * NO_DSA diff --git a/IDE/WIN10/user_settings.h b/IDE/WIN10/user_settings.h index b5513e5bf..2abbf0843 100644 --- a/IDE/WIN10/user_settings.h +++ b/IDE/WIN10/user_settings.h @@ -35,7 +35,6 @@ #define WOLFSSL_SHA384 #define WOLFSSL_SHA512 #define NO_PSK - #define NO_HC128 #define NO_RC4 #define NO_RABBIT #define NO_DSA diff --git a/IDE/WINCE/user_settings.h b/IDE/WINCE/user_settings.h index 4a29cc87d..a6bdea6a3 100644 --- a/IDE/WINCE/user_settings.h +++ b/IDE/WINCE/user_settings.h @@ -81,7 +81,6 @@ #define WOLFSSL_SHA384 #define WOLFSSL_SHA512 #define NO_PSK -#define NO_HC128 #define NO_RC4 #define NO_RABBIT //#define NO_DSA diff --git a/IDE/XCODE-FIPSv2/user_settings.h b/IDE/XCODE-FIPSv2/user_settings.h index 1845e42a1..219ce5ffb 100644 --- a/IDE/XCODE-FIPSv2/user_settings.h +++ b/IDE/XCODE-FIPSv2/user_settings.h @@ -650,9 +650,6 @@ extern "C" { #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/IDE/XCODE/Benchmark/wolfBench.xcodeproj/project.pbxproj b/IDE/XCODE/Benchmark/wolfBench.xcodeproj/project.pbxproj index 46767b6a3..447f1fdc0 100644 --- a/IDE/XCODE/Benchmark/wolfBench.xcodeproj/project.pbxproj +++ b/IDE/XCODE/Benchmark/wolfBench.xcodeproj/project.pbxproj @@ -48,7 +48,6 @@ A4ADF8D71FCE0C5600A06E90 /* wolfevent.c in Sources */ = {isa = PBXBuildFile; fileRef = A4ADF87B1FCE0C4D00A06E90 /* wolfevent.c */; }; A4ADF8D81FCE0C5600A06E90 /* md4.c in Sources */ = {isa = PBXBuildFile; fileRef = A4ADF87C1FCE0C4D00A06E90 /* md4.c */; }; A4ADF8D91FCE0C5600A06E90 /* dsa.c in Sources */ = {isa = PBXBuildFile; fileRef = A4ADF87D1FCE0C4D00A06E90 /* dsa.c */; }; - A4ADF8DB1FCE0C5600A06E90 /* hc128.c in Sources */ = {isa = PBXBuildFile; fileRef = A4ADF87F1FCE0C4D00A06E90 /* hc128.c */; }; A4ADF8DC1FCE0C5600A06E90 /* curve25519.c in Sources */ = {isa = PBXBuildFile; fileRef = A4ADF8801FCE0C4D00A06E90 /* curve25519.c */; }; A4ADF8DD1FCE0C5600A06E90 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = A4ADF8811FCE0C4D00A06E90 /* error.c */; }; A4ADF8DE1FCE0C5600A06E90 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = A4ADF8821FCE0C4D00A06E90 /* aes.c */; }; @@ -151,7 +150,6 @@ A4ADF87B1FCE0C4D00A06E90 /* wolfevent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wolfevent.c; path = ../../../wolfcrypt/src/wolfevent.c; sourceTree = ""; }; A4ADF87C1FCE0C4D00A06E90 /* md4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md4.c; path = ../../../wolfcrypt/src/md4.c; sourceTree = ""; }; A4ADF87D1FCE0C4D00A06E90 /* dsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsa.c; path = ../../../wolfcrypt/src/dsa.c; sourceTree = ""; }; - A4ADF87F1FCE0C4D00A06E90 /* hc128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hc128.c; path = ../../../wolfcrypt/src/hc128.c; sourceTree = ""; }; A4ADF8801FCE0C4D00A06E90 /* curve25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = curve25519.c; path = ../../../wolfcrypt/src/curve25519.c; sourceTree = ""; }; A4ADF8811FCE0C4D00A06E90 /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = error.c; path = ../../../wolfcrypt/src/error.c; sourceTree = ""; }; A4ADF8821FCE0C4D00A06E90 /* aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aes.c; path = ../../../wolfcrypt/src/aes.c; sourceTree = ""; }; @@ -313,7 +311,6 @@ A4ADF8D01FCE0C5500A06E90 /* ge_low_mem.c */, A4ADF88E1FCE0C4E00A06E90 /* ge_operations.c */, A4ADF89A1FCE0C4F00A06E90 /* hash.c */, - A4ADF87F1FCE0C4D00A06E90 /* hc128.c */, A4ADF8751FCE0C4C00A06E90 /* hmac.c */, A4ADF8AD1FCE0C5100A06E90 /* idea.c */, A4ADF8A21FCE0C5000A06E90 /* integer.c */, @@ -462,7 +459,6 @@ A4ADF8321FCE0BD300A06E90 /* ViewController.m in Sources */, A46FE17A2493E8F800A25BE7 /* cryptocb.c in Sources */, A46FE18B2493E8F800A25BE7 /* curve448.c in Sources */, - A4ADF8DB1FCE0C5600A06E90 /* hc128.c in Sources */, A4ADF8E31FCE0C5600A06E90 /* compress.c in Sources */, A4ADF8731FCE0C1C00A06E90 /* tls13.c in Sources */, A4ADF90D1FCE0C5600A06E90 /* blake2b.c in Sources */, diff --git a/IDE/XCODE/README.md b/IDE/XCODE/README.md index af2a5b3c5..9e131bc7d 100644 --- a/IDE/XCODE/README.md +++ b/IDE/XCODE/README.md @@ -91,7 +91,6 @@ When using the FIPS version the following preprocessors need to be defined: * `WOLFSSL_SHA512` * `WOLFSSL_SHA384` * `NO_MD4` -* `NO_HC128` * `NO_RABBIT` * `NO_DSA` * `NO_PWDBASED` diff --git a/IDE/XCODE/user_settings.h b/IDE/XCODE/user_settings.h index 53d8ebe11..024ea9bc9 100644 --- a/IDE/XCODE/user_settings.h +++ b/IDE/XCODE/user_settings.h @@ -7,7 +7,6 @@ #ifdef HAVE_FIPS #define NO_MD4 - #define NO_HC128 #define NO_RABBIT #define NO_DSA #define NO_PWDBASED @@ -69,7 +68,6 @@ /* off by default */ #define NO_RC4 #define NO_MD4 - #define NO_HC128 #define NO_RABBIT #define NO_DSA #define NO_PSK diff --git a/IDE/XCODE/wolfssl-FIPS.xcodeproj/project.pbxproj b/IDE/XCODE/wolfssl-FIPS.xcodeproj/project.pbxproj index e3d726ec8..4b74af20a 100644 --- a/IDE/XCODE/wolfssl-FIPS.xcodeproj/project.pbxproj +++ b/IDE/XCODE/wolfssl-FIPS.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ 5216463B1A8992CC0062516A /* dsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461A1A8992CC0062516A /* dsa.c */; }; 5216463C1A8992CC0062516A /* ecc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461B1A8992CC0062516A /* ecc.c */; }; 5216463D1A8992CC0062516A /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461C1A8992CC0062516A /* error.c */; }; - 5216463E1A8992CC0062516A /* hc128.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461D1A8992CC0062516A /* hc128.c */; }; 5216463F1A8992CC0062516A /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461E1A8992CC0062516A /* hmac.c */; }; 521646401A8992CC0062516A /* integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461F1A8992CC0062516A /* integer.c */; }; 521646411A8992CC0062516A /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646201A8992CC0062516A /* logging.c */; }; @@ -74,7 +73,6 @@ 521646DB1A8A7FF30062516A /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466C1A8993770062516A /* ecc.h */; }; 521646DC1A8A7FF30062516A /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466D1A8993770062516A /* error-crypt.h */; }; 521646DD1A8A7FF30062516A /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466E1A8993770062516A /* fips_test.h */; }; - 521646DE1A8A7FF30062516A /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466F1A8993770062516A /* hc128.h */; }; 521646DF1A8A7FF30062516A /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646701A8993770062516A /* hmac.h */; }; 521646E01A8A7FF30062516A /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646721A8993770062516A /* integer.h */; }; 521646E11A8A7FF30062516A /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646731A8993770062516A /* logging.h */; }; @@ -126,7 +124,6 @@ 5216470F1A8A80100062516A /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A31A8993F50062516A /* ecc.h */; }; 521647101A8A80100062516A /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A41A8993F50062516A /* error-crypt.h */; }; 521647111A8A80100062516A /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A51A8993F50062516A /* fips_test.h */; }; - 521647121A8A80100062516A /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A61A8993F50062516A /* hc128.h */; }; 521647131A8A80100062516A /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A71A8993F50062516A /* hmac.h */; }; 521647141A8A80100062516A /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A81A8993F50062516A /* integer.h */; }; 521647151A8A80100062516A /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A91A8993F50062516A /* logging.h */; }; @@ -193,7 +190,6 @@ A4A54E0A1BC5C3E0002866CD /* wc_port.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646311A8992CC0062516A /* wc_port.c */; }; A4A54E0B1BC5C3E0002866CD /* pwdbased.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646281A8992CC0062516A /* pwdbased.c */; }; A4A54E0C1BC5C3E0002866CD /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646251A8992CC0062516A /* misc.c */; }; - A4A54E0D1BC5C3E0002866CD /* hc128.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461D1A8992CC0062516A /* hc128.c */; }; A4A54E0E1BC5C3E0002866CD /* asn.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646131A8992CC0062516A /* asn.c */; }; A4A54E0F1BC5C3E0002866CD /* sha512.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216462F1A8992CC0062516A /* sha512.c */; }; A4A54E101BC5C3E0002866CD /* rabbit.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646291A8992CC0062516A /* rabbit.c */; }; @@ -254,7 +250,6 @@ A4A54E4A1BC5C3E0002866CD /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466C1A8993770062516A /* ecc.h */; }; A4A54E4B1BC5C3E0002866CD /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466D1A8993770062516A /* error-crypt.h */; }; A4A54E4C1BC5C3E0002866CD /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466E1A8993770062516A /* fips_test.h */; }; - A4A54E4D1BC5C3E0002866CD /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466F1A8993770062516A /* hc128.h */; }; A4A54E4E1BC5C3E0002866CD /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646701A8993770062516A /* hmac.h */; }; A4A54E4F1BC5C3E0002866CD /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646721A8993770062516A /* integer.h */; }; A4A54E501BC5C3E0002866CD /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646731A8993770062516A /* logging.h */; }; @@ -306,7 +301,6 @@ A4A54E801BC5C3E0002866CD /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A31A8993F50062516A /* ecc.h */; }; A4A54E811BC5C3E0002866CD /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A41A8993F50062516A /* error-crypt.h */; }; A4A54E821BC5C3E0002866CD /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A51A8993F50062516A /* fips_test.h */; }; - A4A54E831BC5C3E0002866CD /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A61A8993F50062516A /* hc128.h */; }; A4A54E841BC5C3E0002866CD /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A71A8993F50062516A /* hmac.h */; }; A4A54E851BC5C3E0002866CD /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A81A8993F50062516A /* integer.h */; }; A4A54E861BC5C3E0002866CD /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A91A8993F50062516A /* logging.h */; }; @@ -361,7 +355,6 @@ 521646DB1A8A7FF30062516A /* ecc.h in CopyFiles */, 521646DC1A8A7FF30062516A /* error-crypt.h in CopyFiles */, 521646DD1A8A7FF30062516A /* fips_test.h in CopyFiles */, - 521646DE1A8A7FF30062516A /* hc128.h in CopyFiles */, 521646DF1A8A7FF30062516A /* hmac.h in CopyFiles */, 521646E01A8A7FF30062516A /* integer.h in CopyFiles */, 521646E11A8A7FF30062516A /* logging.h in CopyFiles */, @@ -431,7 +424,6 @@ 5216470F1A8A80100062516A /* ecc.h in CopyFiles */, 521647101A8A80100062516A /* error-crypt.h in CopyFiles */, 521647111A8A80100062516A /* fips_test.h in CopyFiles */, - 521647121A8A80100062516A /* hc128.h in CopyFiles */, 521647131A8A80100062516A /* hmac.h in CopyFiles */, 521647141A8A80100062516A /* integer.h in CopyFiles */, 521647151A8A80100062516A /* logging.h in CopyFiles */, @@ -522,7 +514,6 @@ A4A54E4A1BC5C3E0002866CD /* ecc.h in CopyFiles */, A4A54E4B1BC5C3E0002866CD /* error-crypt.h in CopyFiles */, A4A54E4C1BC5C3E0002866CD /* fips_test.h in CopyFiles */, - A4A54E4D1BC5C3E0002866CD /* hc128.h in CopyFiles */, A4A54E4E1BC5C3E0002866CD /* hmac.h in CopyFiles */, A4A54E4F1BC5C3E0002866CD /* integer.h in CopyFiles */, A4A54E501BC5C3E0002866CD /* logging.h in CopyFiles */, @@ -592,7 +583,6 @@ A4A54E801BC5C3E0002866CD /* ecc.h in CopyFiles */, A4A54E811BC5C3E0002866CD /* error-crypt.h in CopyFiles */, A4A54E821BC5C3E0002866CD /* fips_test.h in CopyFiles */, - A4A54E831BC5C3E0002866CD /* hc128.h in CopyFiles */, A4A54E841BC5C3E0002866CD /* hmac.h in CopyFiles */, A4A54E851BC5C3E0002866CD /* integer.h in CopyFiles */, A4A54E861BC5C3E0002866CD /* logging.h in CopyFiles */, @@ -645,7 +635,6 @@ 5216461A1A8992CC0062516A /* dsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsa.c; path = ../../wolfcrypt/src/dsa.c; sourceTree = SOURCE_ROOT; }; 5216461B1A8992CC0062516A /* ecc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ecc.c; path = ../../wolfcrypt/src/ecc.c; sourceTree = SOURCE_ROOT; }; 5216461C1A8992CC0062516A /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = error.c; path = ../../wolfcrypt/src/error.c; sourceTree = SOURCE_ROOT; }; - 5216461D1A8992CC0062516A /* hc128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hc128.c; path = ../../wolfcrypt/src/hc128.c; sourceTree = SOURCE_ROOT; }; 5216461E1A8992CC0062516A /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hmac.c; path = ../../wolfcrypt/src/hmac.c; sourceTree = SOURCE_ROOT; }; 5216461F1A8992CC0062516A /* integer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = integer.c; path = ../../wolfcrypt/src/integer.c; sourceTree = SOURCE_ROOT; }; 521646201A8992CC0062516A /* logging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = logging.c; path = ../../wolfcrypt/src/logging.c; sourceTree = SOURCE_ROOT; }; @@ -692,7 +681,6 @@ 5216466C1A8993770062516A /* ecc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ecc.h; path = ../../wolfssl/wolfcrypt/ecc.h; sourceTree = ""; }; 5216466D1A8993770062516A /* error-crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "error-crypt.h"; path = "../../wolfssl/wolfcrypt/error-crypt.h"; sourceTree = ""; }; 5216466E1A8993770062516A /* fips_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fips_test.h; path = ../../wolfssl/wolfcrypt/fips_test.h; sourceTree = ""; }; - 5216466F1A8993770062516A /* hc128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hc128.h; path = ../../wolfssl/wolfcrypt/hc128.h; sourceTree = ""; }; 521646701A8993770062516A /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = ../../wolfssl/wolfcrypt/hmac.h; sourceTree = ""; }; 521646721A8993770062516A /* integer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = integer.h; path = ../../wolfssl/wolfcrypt/integer.h; sourceTree = ""; }; 521646731A8993770062516A /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = logging.h; path = ../../wolfssl/wolfcrypt/logging.h; sourceTree = ""; }; @@ -744,7 +732,6 @@ 521646A31A8993F50062516A /* ecc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ecc.h; path = ../../cyassl/ctaocrypt/ecc.h; sourceTree = ""; }; 521646A41A8993F50062516A /* error-crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "error-crypt.h"; path = "../../cyassl/ctaocrypt/error-crypt.h"; sourceTree = ""; }; 521646A51A8993F50062516A /* fips_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fips_test.h; path = ../../cyassl/ctaocrypt/fips_test.h; sourceTree = ""; }; - 521646A61A8993F50062516A /* hc128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hc128.h; path = ../../cyassl/ctaocrypt/hc128.h; sourceTree = ""; }; 521646A71A8993F50062516A /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = ../../cyassl/ctaocrypt/hmac.h; sourceTree = ""; }; 521646A81A8993F50062516A /* integer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = integer.h; path = ../../cyassl/ctaocrypt/integer.h; sourceTree = ""; }; 521646A91A8993F50062516A /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = logging.h; path = ../../cyassl/ctaocrypt/logging.h; sourceTree = ""; }; @@ -843,7 +830,6 @@ 521646A31A8993F50062516A /* ecc.h */, 521646A41A8993F50062516A /* error-crypt.h */, 521646A51A8993F50062516A /* fips_test.h */, - 521646A61A8993F50062516A /* hc128.h */, 521646A71A8993F50062516A /* hmac.h */, 521646A81A8993F50062516A /* integer.h */, 521646A91A8993F50062516A /* logging.h */, @@ -911,7 +897,6 @@ 5216466D1A8993770062516A /* error-crypt.h */, 5216466E1A8993770062516A /* fips_test.h */, 525BE5BB1B3885580054BBCD /* hash.h */, - 5216466F1A8993770062516A /* hc128.h */, 521646701A8993770062516A /* hmac.h */, 6AC8513A272CB01200F2B32A /* kdf.h */, 521646721A8993770062516A /* integer.h */, @@ -986,7 +971,6 @@ 5216461B1A8992CC0062516A /* ecc.c */, 5216461C1A8992CC0062516A /* error.c */, 525BE5B91B38853E0054BBCD /* hash.c */, - 5216461D1A8992CC0062516A /* hc128.c */, 5216461E1A8992CC0062516A /* hmac.c */, 6AC85135272CAFEC00F2B32A /* kdf.c */, 5216461F1A8992CC0062516A /* integer.c */, @@ -1163,7 +1147,6 @@ 521646521A8992CC0062516A /* wc_port.c in Sources */, 521646491A8992CC0062516A /* pwdbased.c in Sources */, 521646461A8992CC0062516A /* misc.c in Sources */, - 5216463E1A8992CC0062516A /* hc128.c in Sources */, 521646341A8992CC0062516A /* asn.c in Sources */, 521646501A8992CC0062516A /* sha512.c in Sources */, 5216464A1A8992CC0062516A /* rabbit.c in Sources */, @@ -1226,7 +1209,6 @@ A4A54E0A1BC5C3E0002866CD /* wc_port.c in Sources */, A4A54E0B1BC5C3E0002866CD /* pwdbased.c in Sources */, A4A54E0C1BC5C3E0002866CD /* misc.c in Sources */, - A4A54E0D1BC5C3E0002866CD /* hc128.c in Sources */, A4A54E0E1BC5C3E0002866CD /* asn.c in Sources */, A4A54E0F1BC5C3E0002866CD /* sha512.c in Sources */, A4A54E101BC5C3E0002866CD /* rabbit.c in Sources */, diff --git a/IDE/XCODE/wolfssl.xcodeproj/project.pbxproj b/IDE/XCODE/wolfssl.xcodeproj/project.pbxproj index 8f2ba4009..035994ebb 100644 --- a/IDE/XCODE/wolfssl.xcodeproj/project.pbxproj +++ b/IDE/XCODE/wolfssl.xcodeproj/project.pbxproj @@ -43,7 +43,6 @@ 30B060661C6DDB2B00D46008 /* ecc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461B1A8992CC0062516A /* ecc.c */; }; 30B060671C6DDB2B00D46008 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461C1A8992CC0062516A /* error.c */; }; 30B060681C6DDB2B00D46008 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 525BE5331B3869110054BBCD /* hash.c */; }; - 30B060691C6DDB2B00D46008 /* hc128.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461D1A8992CC0062516A /* hc128.c */; }; 30B0606A1C6DDB2B00D46008 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461E1A8992CC0062516A /* hmac.c */; }; 30B0606B1C6DDB2B00D46008 /* integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461F1A8992CC0062516A /* integer.c */; }; 30B0606C1C6DDB2B00D46008 /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646201A8992CC0062516A /* logging.c */; }; @@ -91,7 +90,6 @@ 30B0609A1C6DDB6200D46008 /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466D1A8993770062516A /* error-crypt.h */; }; 30B0609B1C6DDB6200D46008 /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466E1A8993770062516A /* fips_test.h */; }; 30B0609C1C6DDB6200D46008 /* hash.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 525BE5351B3869430054BBCD /* hash.h */; }; - 30B0609D1C6DDB6200D46008 /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466F1A8993770062516A /* hc128.h */; }; 30B0609E1C6DDB6200D46008 /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646701A8993770062516A /* hmac.h */; }; 30B0609F1C6DDB6200D46008 /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646721A8993770062516A /* integer.h */; }; 30B060A01C6DDB6200D46008 /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646731A8993770062516A /* logging.h */; }; @@ -144,7 +142,6 @@ 30B060CF1C6DDB9800D46008 /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A31A8993F50062516A /* ecc.h */; }; 30B060D01C6DDB9800D46008 /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A41A8993F50062516A /* error-crypt.h */; }; 30B060D11C6DDB9800D46008 /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A51A8993F50062516A /* fips_test.h */; }; - 30B060D21C6DDB9800D46008 /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A61A8993F50062516A /* hc128.h */; }; 30B060D31C6DDB9800D46008 /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A71A8993F50062516A /* hmac.h */; }; 30B060D41C6DDB9800D46008 /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A81A8993F50062516A /* integer.h */; }; 30B060D51C6DDB9800D46008 /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A91A8993F50062516A /* logging.h */; }; @@ -227,7 +224,6 @@ 5216463B1A8992CC0062516A /* dsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461A1A8992CC0062516A /* dsa.c */; }; 5216463C1A8992CC0062516A /* ecc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461B1A8992CC0062516A /* ecc.c */; }; 5216463D1A8992CC0062516A /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461C1A8992CC0062516A /* error.c */; }; - 5216463E1A8992CC0062516A /* hc128.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461D1A8992CC0062516A /* hc128.c */; }; 5216463F1A8992CC0062516A /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461E1A8992CC0062516A /* hmac.c */; }; 521646401A8992CC0062516A /* integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461F1A8992CC0062516A /* integer.c */; }; 521646411A8992CC0062516A /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646201A8992CC0062516A /* logging.c */; }; @@ -273,7 +269,6 @@ 521646DB1A8A7FF30062516A /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466C1A8993770062516A /* ecc.h */; }; 521646DC1A8A7FF30062516A /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466D1A8993770062516A /* error-crypt.h */; }; 521646DD1A8A7FF30062516A /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466E1A8993770062516A /* fips_test.h */; }; - 521646DE1A8A7FF30062516A /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466F1A8993770062516A /* hc128.h */; }; 521646DF1A8A7FF30062516A /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646701A8993770062516A /* hmac.h */; }; 521646E01A8A7FF30062516A /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646721A8993770062516A /* integer.h */; }; 521646E11A8A7FF30062516A /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646731A8993770062516A /* logging.h */; }; @@ -325,7 +320,6 @@ 5216470F1A8A80100062516A /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A31A8993F50062516A /* ecc.h */; }; 521647101A8A80100062516A /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A41A8993F50062516A /* error-crypt.h */; }; 521647111A8A80100062516A /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A51A8993F50062516A /* fips_test.h */; }; - 521647121A8A80100062516A /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A61A8993F50062516A /* hc128.h */; }; 521647131A8A80100062516A /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A71A8993F50062516A /* hmac.h */; }; 521647141A8A80100062516A /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A81A8993F50062516A /* integer.h */; }; 521647151A8A80100062516A /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A91A8993F50062516A /* logging.h */; }; @@ -436,7 +430,6 @@ A4F318551BC58B1700FDF2BB /* camellia.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646151A8992CC0062516A /* camellia.c */; }; A4F318561BC58B1700FDF2BB /* wc_port.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646311A8992CC0062516A /* wc_port.c */; }; A4F318571BC58B1700FDF2BB /* pwdbased.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646281A8992CC0062516A /* pwdbased.c */; }; - A4F318591BC58B1700FDF2BB /* hc128.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461D1A8992CC0062516A /* hc128.c */; }; A4F3185A1BC58B1700FDF2BB /* asn.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646131A8992CC0062516A /* asn.c */; }; A4F3185B1BC58B1700FDF2BB /* sha512.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216462F1A8992CC0062516A /* sha512.c */; }; A4F3185C1BC58B1700FDF2BB /* rabbit.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646291A8992CC0062516A /* rabbit.c */; }; @@ -498,7 +491,6 @@ A4F318971BC58B1700FDF2BB /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466C1A8993770062516A /* ecc.h */; }; A4F318981BC58B1700FDF2BB /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466D1A8993770062516A /* error-crypt.h */; }; A4F318991BC58B1700FDF2BB /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466E1A8993770062516A /* fips_test.h */; }; - A4F3189A1BC58B1700FDF2BB /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5216466F1A8993770062516A /* hc128.h */; }; A4F3189B1BC58B1700FDF2BB /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646701A8993770062516A /* hmac.h */; }; A4F3189C1BC58B1700FDF2BB /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646721A8993770062516A /* integer.h */; }; A4F3189D1BC58B1700FDF2BB /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646731A8993770062516A /* logging.h */; }; @@ -550,7 +542,6 @@ A4F318CD1BC58B1700FDF2BB /* ecc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A31A8993F50062516A /* ecc.h */; }; A4F318CE1BC58B1700FDF2BB /* error-crypt.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A41A8993F50062516A /* error-crypt.h */; }; A4F318CF1BC58B1700FDF2BB /* fips_test.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A51A8993F50062516A /* fips_test.h */; }; - A4F318D01BC58B1700FDF2BB /* hc128.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A61A8993F50062516A /* hc128.h */; }; A4F318D11BC58B1700FDF2BB /* hmac.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A71A8993F50062516A /* hmac.h */; }; A4F318D21BC58B1700FDF2BB /* integer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A81A8993F50062516A /* integer.h */; }; A4F318D31BC58B1700FDF2BB /* logging.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 521646A91A8993F50062516A /* logging.h */; }; @@ -625,7 +616,6 @@ 30B0609A1C6DDB6200D46008 /* error-crypt.h in CopyFiles */, 30B0609B1C6DDB6200D46008 /* fips_test.h in CopyFiles */, 30B0609C1C6DDB6200D46008 /* hash.h in CopyFiles */, - 30B0609D1C6DDB6200D46008 /* hc128.h in CopyFiles */, 30B0609E1C6DDB6200D46008 /* hmac.h in CopyFiles */, 30B0609F1C6DDB6200D46008 /* integer.h in CopyFiles */, 30B060A01C6DDB6200D46008 /* logging.h in CopyFiles */, @@ -696,7 +686,6 @@ 30B060CF1C6DDB9800D46008 /* ecc.h in CopyFiles */, 30B060D01C6DDB9800D46008 /* error-crypt.h in CopyFiles */, 30B060D11C6DDB9800D46008 /* fips_test.h in CopyFiles */, - 30B060D21C6DDB9800D46008 /* hc128.h in CopyFiles */, 30B060D31C6DDB9800D46008 /* hmac.h in CopyFiles */, 30B060D41C6DDB9800D46008 /* integer.h in CopyFiles */, 30B060D51C6DDB9800D46008 /* logging.h in CopyFiles */, @@ -753,7 +742,6 @@ 521646DB1A8A7FF30062516A /* ecc.h in CopyFiles */, 521646DC1A8A7FF30062516A /* error-crypt.h in CopyFiles */, 521646DD1A8A7FF30062516A /* fips_test.h in CopyFiles */, - 521646DE1A8A7FF30062516A /* hc128.h in CopyFiles */, 521646DF1A8A7FF30062516A /* hmac.h in CopyFiles */, 521646E01A8A7FF30062516A /* integer.h in CopyFiles */, 521646E11A8A7FF30062516A /* logging.h in CopyFiles */, @@ -823,7 +811,6 @@ 5216470F1A8A80100062516A /* ecc.h in CopyFiles */, 521647101A8A80100062516A /* error-crypt.h in CopyFiles */, 521647111A8A80100062516A /* fips_test.h in CopyFiles */, - 521647121A8A80100062516A /* hc128.h in CopyFiles */, 521647131A8A80100062516A /* hmac.h in CopyFiles */, 521647141A8A80100062516A /* integer.h in CopyFiles */, 521647151A8A80100062516A /* logging.h in CopyFiles */, @@ -918,7 +905,6 @@ A4F318971BC58B1700FDF2BB /* ecc.h in CopyFiles */, A4F318981BC58B1700FDF2BB /* error-crypt.h in CopyFiles */, A4F318991BC58B1700FDF2BB /* fips_test.h in CopyFiles */, - A4F3189A1BC58B1700FDF2BB /* hc128.h in CopyFiles */, A4F3189B1BC58B1700FDF2BB /* hmac.h in CopyFiles */, A4F3189C1BC58B1700FDF2BB /* integer.h in CopyFiles */, A4F3189D1BC58B1700FDF2BB /* logging.h in CopyFiles */, @@ -988,7 +974,6 @@ A4F318CD1BC58B1700FDF2BB /* ecc.h in CopyFiles */, A4F318CE1BC58B1700FDF2BB /* error-crypt.h in CopyFiles */, A4F318CF1BC58B1700FDF2BB /* fips_test.h in CopyFiles */, - A4F318D01BC58B1700FDF2BB /* hc128.h in CopyFiles */, A4F318D11BC58B1700FDF2BB /* hmac.h in CopyFiles */, A4F318D21BC58B1700FDF2BB /* integer.h in CopyFiles */, A4F318D31BC58B1700FDF2BB /* logging.h in CopyFiles */, @@ -1059,7 +1044,6 @@ 5216461A1A8992CC0062516A /* dsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsa.c; path = ../../wolfcrypt/src/dsa.c; sourceTree = SOURCE_ROOT; }; 5216461B1A8992CC0062516A /* ecc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ecc.c; path = ../../wolfcrypt/src/ecc.c; sourceTree = SOURCE_ROOT; }; 5216461C1A8992CC0062516A /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = error.c; path = ../../wolfcrypt/src/error.c; sourceTree = SOURCE_ROOT; }; - 5216461D1A8992CC0062516A /* hc128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hc128.c; path = ../../wolfcrypt/src/hc128.c; sourceTree = SOURCE_ROOT; }; 5216461E1A8992CC0062516A /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hmac.c; path = ../../wolfcrypt/src/hmac.c; sourceTree = SOURCE_ROOT; }; 5216461F1A8992CC0062516A /* integer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = integer.c; path = ../../wolfcrypt/src/integer.c; sourceTree = SOURCE_ROOT; }; 521646201A8992CC0062516A /* logging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = logging.c; path = ../../wolfcrypt/src/logging.c; sourceTree = SOURCE_ROOT; }; @@ -1106,7 +1090,6 @@ 5216466C1A8993770062516A /* ecc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ecc.h; path = ../../wolfssl/wolfcrypt/ecc.h; sourceTree = ""; }; 5216466D1A8993770062516A /* error-crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "error-crypt.h"; path = "../../wolfssl/wolfcrypt/error-crypt.h"; sourceTree = ""; }; 5216466E1A8993770062516A /* fips_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fips_test.h; path = ../../wolfssl/wolfcrypt/fips_test.h; sourceTree = ""; }; - 5216466F1A8993770062516A /* hc128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hc128.h; path = ../../wolfssl/wolfcrypt/hc128.h; sourceTree = ""; }; 521646701A8993770062516A /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = ../../wolfssl/wolfcrypt/hmac.h; sourceTree = ""; }; 521646721A8993770062516A /* integer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = integer.h; path = ../../wolfssl/wolfcrypt/integer.h; sourceTree = ""; }; 521646731A8993770062516A /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = logging.h; path = ../../wolfssl/wolfcrypt/logging.h; sourceTree = ""; }; @@ -1158,7 +1141,6 @@ 521646A31A8993F50062516A /* ecc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ecc.h; path = ../../cyassl/ctaocrypt/ecc.h; sourceTree = ""; }; 521646A41A8993F50062516A /* error-crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "error-crypt.h"; path = "../../cyassl/ctaocrypt/error-crypt.h"; sourceTree = ""; }; 521646A51A8993F50062516A /* fips_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fips_test.h; path = ../../cyassl/ctaocrypt/fips_test.h; sourceTree = ""; }; - 521646A61A8993F50062516A /* hc128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hc128.h; path = ../../cyassl/ctaocrypt/hc128.h; sourceTree = ""; }; 521646A71A8993F50062516A /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = ../../cyassl/ctaocrypt/hmac.h; sourceTree = ""; }; 521646A81A8993F50062516A /* integer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = integer.h; path = ../../cyassl/ctaocrypt/integer.h; sourceTree = ""; }; 521646A91A8993F50062516A /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = logging.h; path = ../../cyassl/ctaocrypt/logging.h; sourceTree = ""; }; @@ -1275,7 +1257,6 @@ 521646A31A8993F50062516A /* ecc.h */, 521646A41A8993F50062516A /* error-crypt.h */, 521646A51A8993F50062516A /* fips_test.h */, - 521646A61A8993F50062516A /* hc128.h */, 521646A71A8993F50062516A /* hmac.h */, 521646A81A8993F50062516A /* integer.h */, 521646A91A8993F50062516A /* logging.h */, @@ -1343,7 +1324,6 @@ 5216466D1A8993770062516A /* error-crypt.h */, 5216466E1A8993770062516A /* fips_test.h */, 525BE5351B3869430054BBCD /* hash.h */, - 5216466F1A8993770062516A /* hc128.h */, 521646701A8993770062516A /* hmac.h */, 6AC8513B272CB04F00F2B32A /* kdf.h */, 521646721A8993770062516A /* integer.h */, @@ -1438,7 +1418,6 @@ 1E8BEB81212F4E330063DCC1 /* ge_low_mem.c */, 1E8BEB80212F4E330063DCC1 /* ge_operations.c */, 525BE5331B3869110054BBCD /* hash.c */, - 5216461D1A8992CC0062516A /* hc128.c */, 5216461E1A8992CC0062516A /* hmac.c */, 6AC85128272CAF2E00F2B32A /* kdf.c */, A4DAE3192493F21900CEF51F /* idea.c */, @@ -1662,7 +1641,6 @@ 520775AA2239ABBE00087711 /* sp_int.c in Sources */, 30B060681C6DDB2B00D46008 /* hash.c in Sources */, A4DAE34C2493F21900CEF51F /* idea.c in Sources */, - 30B060691C6DDB2B00D46008 /* hc128.c in Sources */, 6AC8512B272CAF2E00F2B32A /* kdf.c in Sources */, 30B0606A1C6DDB2B00D46008 /* hmac.c in Sources */, A4DAE3572493F29E00CEF51F /* sp_dsp32.c in Sources */, @@ -1729,7 +1707,6 @@ 521646491A8992CC0062516A /* pwdbased.c in Sources */, A4DAE3472493F21900CEF51F /* blake2s.c in Sources */, A4DAE31A2493F21900CEF51F /* srp.c in Sources */, - 5216463E1A8992CC0062516A /* hc128.c in Sources */, 521646341A8992CC0062516A /* asn.c in Sources */, 521646501A8992CC0062516A /* sha512.c in Sources */, 5216464A1A8992CC0062516A /* rabbit.c in Sources */, @@ -1823,7 +1800,6 @@ A4DAE31B2493F21900CEF51F /* srp.c in Sources */, A4F3185D1BC58B1700FDF2BB /* hash.c in Sources */, A4DAE33C2493F21900CEF51F /* curve448.c in Sources */, - A4F318591BC58B1700FDF2BB /* hc128.c in Sources */, A4F318731BC58B1700FDF2BB /* hmac.c in Sources */, A4F318751BC58B1700FDF2BB /* integer.c in Sources */, A4F318761BC58B1700FDF2BB /* internal.c in Sources */, diff --git a/IDE/XilinxSDK/2019_2/wolfCrypt_example/.project b/IDE/XilinxSDK/2019_2/wolfCrypt_example/.project index f85a59460..8327c9c2b 100644 --- a/IDE/XilinxSDK/2019_2/wolfCrypt_example/.project +++ b/IDE/XilinxSDK/2019_2/wolfCrypt_example/.project @@ -510,11 +510,6 @@ 1 PARENT-4-PROJECT_LOC/wolfcrypt/src/kdf.c - - src/wolfcrypt/src/hc128.c - 1 - PARENT-4-PROJECT_LOC/wolfcrypt/src/hc128.c - src/wolfcrypt/src/hmac.c 1 diff --git a/IDE/XilinxSDK/user_settings.h b/IDE/XilinxSDK/user_settings.h index 01049b72b..bf1bfa27e 100644 --- a/IDE/XilinxSDK/user_settings.h +++ b/IDE/XilinxSDK/user_settings.h @@ -111,7 +111,6 @@ extern unsigned char my_rng_seed_gen(void); #define NO_MD4 #define NO_MD5 #define NO_SHA -#define NO_HC128 #define NO_RABBIT #define NO_PSK #define NO_DES3 diff --git a/IDE/iotsafe/user_settings.h b/IDE/iotsafe/user_settings.h index 99e792a02..959010770 100644 --- a/IDE/iotsafe/user_settings.h +++ b/IDE/iotsafe/user_settings.h @@ -164,7 +164,6 @@ static inline long XTIME(long *x) { return jiffies;} #define NO_MD4 #define NO_MD5 #define NO_SHA -#define NO_HC128 #define NO_RABBIT #define NO_PKCS12 diff --git a/cmake/functions.cmake b/cmake/functions.cmake index 0b03a6716..951770e51 100644 --- a/cmake/functions.cmake +++ b/cmake/functions.cmake @@ -148,9 +148,6 @@ function(generate_build_flags) if(WOLFSSL_SHA OR WOLFSSL_USER_SETTINGS) set(BUILD_SHA "yes" PARENT_SCOPE) endif() - if(WOLFSSL_HC128 OR WOLFSSL_USER_SETTINGS) - set(BUILD_HC128 "yes" PARENT_SCOPE) - endif() if(WOLFSSL_RABBIT OR WOLFSSL_USER_SETTINGS) set(BUILD_RABBIT "yes" PARENT_SCOPE) endif() @@ -692,10 +689,6 @@ function(generate_lib_src_list LIB_SOURCES) list(APPEND LIB_SOURCES wolfcrypt/src/blake2s.c) endif() - if(BUILD_HC128) - list(APPEND LIB_SOURCES wolfcrypt/src/hc128.c) - endif() - if(BUILD_RABBIT) list(APPEND LIB_SOURCES wolfcrypt/src/rabbit.c) endif() diff --git a/commit-tests.sh b/commit-tests.sh index 74ef1fa6a..4fb10f397 100755 --- a/commit-tests.sh +++ b/commit-tests.sh @@ -23,7 +23,7 @@ RESULT=$? # make sure full config is ok echo -e "\n\nTesting full config as well...\n\n" -./configure --enable-opensslextra --enable-des3 --enable-dh --enable-ecc --enable-dtls --enable-aesgcm --enable-aesccm --enable-hc128 --enable-sniffer --enable-psk --enable-rabbit --enable-camellia --enable-sha512 --enable-crl --enable-ocsp --enable-savesession --enable-savecert --enable-atomicuser --enable-pkcallbacks --enable-scep; +./configure --enable-opensslextra --enable-des3 --enable-dh --enable-ecc --enable-dtls --enable-aesgcm --enable-aesccm --enable-sniffer --enable-psk --enable-rabbit --enable-camellia --enable-sha512 --enable-crl --enable-ocsp --enable-savesession --enable-savecert --enable-atomicuser --enable-pkcallbacks --enable-scep; RESULT=$? [ $RESULT -ne 0 ] && echo -e "\n\nFull config ./configure failed" && exit 1 diff --git a/configure.ac b/configure.ac index 55677749f..e3ffbbc87 100644 --- a/configure.ac +++ b/configure.ac @@ -517,7 +517,6 @@ then test "$enable_idea" = "" && enable_idea=yes test "$enable_cmac" = "" && enable_cmac=yes test "$enable_xts" = "" && enable_xts=yes - test "$enable_hc128" = "" && enable_hc128=yes test "$enable_rabbit" = "" && enable_rabbit=yes test "$enable_ocsp" = "" && enable_ocsp=yes test "$enable_ocspstapling" = "" && enable_ocspstapling=yes @@ -684,7 +683,6 @@ then test "$enable_idea" = "" && enable_idea=yes test "$enable_cmac" = "" && enable_cmac=yes test "$enable_xts" = "" && enable_xts=yes - test "$enable_hc128" = "" && enable_hc128=yes test "$enable_rabbit" = "" && enable_rabbit=yes test "$enable_ocsp" = "" && enable_ocsp=yes test "$enable_ocspstapling" = "" && enable_ocspstapling=yes @@ -3405,21 +3403,6 @@ then fi -# HC128 -AC_ARG_ENABLE([hc128], - [AS_HELP_STRING([--enable-hc128],[Enable HC-128 (default: disabled)])], - [ ENABLED_HC128=$enableval ], - [ ENABLED_HC128=no ] - ) - -if test "$ENABLED_HC128" = "no" -then - AM_CFLAGS="$AM_CFLAGS -DNO_HC128" -else - AM_CFLAGS="$AM_CFLAGS -DHAVE_HC128" -fi - - # RABBIT AC_ARG_ENABLE([rabbit], [AS_HELP_STRING([--enable-rabbit],[Enable RABBIT (default: disabled)])], @@ -7385,7 +7368,6 @@ AM_CONDITIONAL([BUILD_IDEA],[test "x$ENABLED_IDEA" = "xyes" || test "x$ENABLED_U AM_CONDITIONAL([BUILD_RC4],[test "x$ENABLED_ARC4" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_MD5],[test "x$ENABLED_MD5" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_SHA],[test "x$ENABLED_SHA" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) -AM_CONDITIONAL([BUILD_HC128],[test "x$ENABLED_HC128" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_RABBIT],[test "x$ENABLED_RABBIT" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_FIPS],[test "x$ENABLED_FIPS" = "xyes"]) AM_CONDITIONAL([BUILD_FIPS_V1],[test "$HAVE_FIPS_VERSION" = 1]) @@ -7719,7 +7701,6 @@ echo " * certgen: $ENABLED_CERTGEN" echo " * certreq: $ENABLED_CERTREQ" echo " * certext: $ENABLED_CERTEXT" echo " * certgencache: $ENABLED_certgencache" -echo " * HC-128: $ENABLED_HC128" echo " * RABBIT: $ENABLED_RABBIT" echo " * CHACHA: $ENABLED_CHACHA" echo " * XCHACHA: $ENABLED_XCHACHA" diff --git a/ctaocrypt/ctaocrypt.vcproj b/ctaocrypt/ctaocrypt.vcproj index 0f8779e04..a1aaad7de 100644 --- a/ctaocrypt/ctaocrypt.vcproj +++ b/ctaocrypt/ctaocrypt.vcproj @@ -180,10 +180,6 @@ RelativePath=".\include\error-crypt.h" > - - @@ -280,10 +276,6 @@ RelativePath=".\src\dsa.c" > - - diff --git a/cyassl/ctaocrypt/hc128.h b/cyassl/ctaocrypt/hc128.h deleted file mode 100644 index 378389343..000000000 --- a/cyassl/ctaocrypt/hc128.h +++ /dev/null @@ -1,40 +0,0 @@ -/* hc128.h - * - * Copyright (C) 2006-2021 wolfSSL Inc. - * - * This file is part of wolfSSL. - * - * wolfSSL is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * wolfSSL is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA - */ - - - -#ifndef NO_HC128 - -#ifndef CTAO_CRYPT_HC128_H -#define CTAO_CRYPT_HC128_H - -#include - -/* for hc128 reverse compatibility */ -#ifdef HAVE_HC128 - #define Hc128_Process wc_Hc128_Process - #define Hc128_SetKey wc_Hc128_SetKey -#endif - -#endif /* CTAO_CRYPT_HC128_H */ - -#endif /* HAVE_HC128 */ - diff --git a/cyassl/ctaocrypt/include.am b/cyassl/ctaocrypt/include.am index c30b26fa7..bd8e0487f 100644 --- a/cyassl/ctaocrypt/include.am +++ b/cyassl/ctaocrypt/include.am @@ -18,7 +18,6 @@ nobase_include_HEADERS+= \ cyassl/ctaocrypt/ecc.h \ cyassl/ctaocrypt/error-crypt.h \ cyassl/ctaocrypt/fips_test.h \ - cyassl/ctaocrypt/hc128.h \ cyassl/ctaocrypt/hmac.h \ cyassl/ctaocrypt/integer.h \ cyassl/ctaocrypt/md2.h \ diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h index adac2b4e4..197123cb9 100644 --- a/cyassl/ctaocrypt/settings.h +++ b/cyassl/ctaocrypt/settings.h @@ -191,7 +191,6 @@ #define NO_SHA512 #define NO_DH #define NO_DSA - #define NO_HC128 #define HAVE_ECC #define NO_SESSION_CACHE #define CYASSL_CMSIS_RTOS @@ -285,9 +284,6 @@ #ifndef NO_DSA #define NO_DSA #endif - #ifndef NO_HC128 - #define NO_HC128 - #endif #ifndef SINGLE_THREADED #include "FreeRTOS.h" @@ -367,7 +363,6 @@ #define NO_SHA512 #define NO_DH #define NO_DSA - #define NO_HC128 #define NO_DEV_RANDOM #define NO_CYASSL_DIR #define NO_RABBIT @@ -557,12 +552,6 @@ #define NO_RABBIT #endif - #if (SSL_CFG_HC128_EN == DEF_ENABLED) - #undef NO_HC128 - #else - #define NO_HC128 - #endif - #if (CPU_CFG_ENDIAN_TYPE == CPU_ENDIAN_TYPE_BIG) #define BIG_ENDIAN_ORDER #else diff --git a/doc/README_DOXYGEN b/doc/README_DOXYGEN index 63e6b31cd..8c6bc2373 100644 --- a/doc/README_DOXYGEN +++ b/doc/README_DOXYGEN @@ -116,7 +116,6 @@ are as follows but new group can be made: \ingroup Diffie-Hellman \ingroup ECC \ingroup ED25519 - \ingroup HC128 \ingroup HMAC \ingroup IDEA \ingroup MD2 diff --git a/doc/dox_comments/header_files/doxygen_groups.h b/doc/dox_comments/header_files/doxygen_groups.h index d699b234c..179e4b684 100644 --- a/doc/dox_comments/header_files/doxygen_groups.h +++ b/doc/dox_comments/header_files/doxygen_groups.h @@ -193,7 +193,6 @@ Generate a random SSV (wc_GenerateSakkeSSV()) for key exchange.\n Derive the SSV, (wc_DeriveSakkeSSV()) on the recipient from the encapsulated SSV. - \defgroup HC128 Algorithms - HC-128 \defgroup HMAC Algorithms - HMAC \defgroup IDEA Algorithms - IDEA \defgroup MD2 Algorithms - MD2 diff --git a/doc/dox_comments/header_files/doxygen_pages.h b/doc/dox_comments/header_files/doxygen_pages.h index dd558f9a8..704134359 100644 --- a/doc/dox_comments/header_files/doxygen_pages.h +++ b/doc/dox_comments/header_files/doxygen_pages.h @@ -43,7 +43,6 @@
  • \ref ED448
  • \ref ECCSI
  • \ref SAKKE
    • -
  • \ref HC128
  • \ref HMAC
  • \ref IDEA
  • \ref MD2
    • diff --git a/doc/dox_comments/header_files/hc128.h b/doc/dox_comments/header_files/hc128.h deleted file mode 100644 index 2e24cdba8..000000000 --- a/doc/dox_comments/header_files/hc128.h +++ /dev/null @@ -1,66 +0,0 @@ -/*! - \ingroup HC128 - - \brief This function encrypts or decrypts a message of any size from the - input buffer input, and stores the resulting plaintext/ciphertext in - the output buffer output. - - \return 0 Returned upon successfully encrypting/decrypting the given input - \return MEMORY_E Returned if the input and output buffers are not aligned - along a 4-byte boundary, and there is an error allocating memory - \return BAD_ALIGN_E Returned if the input or output buffers are not - aligned along a 4-byte boundary, and NO_WOLFSSL_ALLOC_ALIGN is defined - - \param ctx pointer to a HC-128 context object with an initialized key - to use for encryption or decryption - \param output buffer in which to store the processed input - \param input buffer containing the plaintext to encrypt or the - ciphertext to decrypt - \param msglen length of the plaintext to encrypt or the ciphertext - to decrypt - - _Example_ - \code - HC128 enc; - byte key[] = { // initialize with key }; - byte iv[] = { // initialize with iv }; - wc_Hc128_SetKey(&enc, key, iv); - - byte msg[] = { // initialize with message }; - byte cipher[sizeof(msg)]; - - if (wc_Hc128_Process(*enc, cipher, plain, sizeof(plain)) != 0) { - // error encrypting msg - } - \endcode - - \sa wc_Hc128_SetKey -*/ -WOLFSSL_API int wc_Hc128_Process(HC128*, byte*, const byte*, word32); - -/*! - \ingroup HC128 - - \brief This function initializes an HC128 context object by - setting its key and iv. - - \return 0 Returned upon successfully setting the key and iv - for the HC128 context object - - \param ctx pointer to an HC-128 context object to initialize - \param key pointer to the buffer containing the 16 byte key to - use with encryption/decryption - \param iv pointer to the buffer containing the 16 byte iv (nonce) - with which to initialize the HC128 object - - _Example_ - \code - HC128 enc; - byte key[] = { // initialize with key }; - byte iv[] = { // initialize with iv }; - wc_Hc128_SetKey(&enc, key, iv); - \endcode - - \sa wc_Hc128_Process -*/ -WOLFSSL_API int wc_Hc128_SetKey(HC128*, const byte* key, const byte* iv); diff --git a/doc/dox_comments/header_files/ssl.h b/doc/dox_comments/header_files/ssl.h index 8d67d9c7d..f45baa281 100644 --- a/doc/dox_comments/header_files/ssl.h +++ b/doc/dox_comments/header_files/ssl.h @@ -8342,8 +8342,7 @@ WOLFSSL_API int wolfSSL_IsTLSv1_1(WOLFSSL*); \return If successful the call will return one of the following: wolfssl_cipher_null, wolfssl_des, wolfssl_triple_des, wolfssl_aes, - wolfssl_aes_gcm, wolfssl_aes_ccm, wolfssl_camellia, wolfssl_hc128, - wolfssl_rabbit. + wolfssl_aes_gcm, wolfssl_aes_ccm, wolfssl_camellia, wolfssl_rabbit. \return BAD_FUNC_ARG will be returned for an error state. \param ssl a pointer to a WOLFSSL object, created using wolfSSL_new(). diff --git a/examples/configs/user_settings_all.h b/examples/configs/user_settings_all.h index fbd09338c..48ce187cc 100644 --- a/examples/configs/user_settings_all.h +++ b/examples/configs/user_settings_all.h @@ -170,7 +170,6 @@ extern "C" { #define WOLFSSL_DES_ECB /* Non-Standard Algorithms (DG disabled) */ -//#define HAVE_HC128 //#define HAVE_RABBIT //#define HAVE_IDEA //#define HAVE_CAMELLIA diff --git a/examples/configs/user_settings_fipsv2.h b/examples/configs/user_settings_fipsv2.h index eac8ffd7a..6d796a900 100644 --- a/examples/configs/user_settings_fipsv2.h +++ b/examples/configs/user_settings_fipsv2.h @@ -100,7 +100,6 @@ extern "C" { /* Disabled Algorithms */ #define NO_DSA -#define NO_HC128 #define NO_MD4 #define NO_PSK #define NO_PWDBASED diff --git a/examples/configs/user_settings_min_ecc.h b/examples/configs/user_settings_min_ecc.h index 5b2ccf834..299329c8e 100644 --- a/examples/configs/user_settings_min_ecc.h +++ b/examples/configs/user_settings_min_ecc.h @@ -86,7 +86,6 @@ extern "C" { #define NO_MD4 #define NO_MD5 #define NO_SHA -#define NO_HC128 #define NO_RABBIT #define NO_PWDBASED #define NO_PKCS12 diff --git a/examples/configs/user_settings_stm32.h b/examples/configs/user_settings_stm32.h index 8e2ce9c18..53f53734d 100644 --- a/examples/configs/user_settings_stm32.h +++ b/examples/configs/user_settings_stm32.h @@ -560,7 +560,6 @@ #define NO_DSA #define NO_RC4 -#define NO_HC128 #define NO_RABBIT #define NO_MD4 #define NO_DES3 diff --git a/examples/configs/user_settings_template.h b/examples/configs/user_settings_template.h index cfc95ddc8..75d591ebd 100644 --- a/examples/configs/user_settings_template.h +++ b/examples/configs/user_settings_template.h @@ -525,7 +525,6 @@ extern "C" { #define NO_DSA #define NO_RC4 -#define NO_HC128 #define NO_RABBIT #define NO_MD4 #define NO_PWDBASED diff --git a/examples/configs/user_settings_wolfboot_keytools.h b/examples/configs/user_settings_wolfboot_keytools.h index 230c73245..1241d386c 100644 --- a/examples/configs/user_settings_wolfboot_keytools.h +++ b/examples/configs/user_settings_wolfboot_keytools.h @@ -78,7 +78,6 @@ #define NO_SIG_WRAPPER #define NO_CERT #define NO_SESSION_CACHE -#define NO_HC128 #define NO_DES3 #define NO_PWDBASED #define NO_WRITEV diff --git a/linuxkm/module_exports.c.template b/linuxkm/module_exports.c.template index b7fc29e66..d2a63669c 100644 --- a/linuxkm/module_exports.c.template +++ b/linuxkm/module_exports.c.template @@ -78,7 +78,6 @@ #include #include #include -#include #include #include #include diff --git a/mcapi/user_settings.h b/mcapi/user_settings.h index b89a6f785..9a2ddc254 100644 --- a/mcapi/user_settings.h +++ b/mcapi/user_settings.h @@ -356,9 +356,6 @@ extern "C" { #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/mcapi/wolfssl.X/nbproject/configurations.xml b/mcapi/wolfssl.X/nbproject/configurations.xml index d805bac76..d810611f4 100644 --- a/mcapi/wolfssl.X/nbproject/configurations.xml +++ b/mcapi/wolfssl.X/nbproject/configurations.xml @@ -29,7 +29,6 @@ ../../wolfcrypt/src/ecc.c ../../wolfcrypt/src/ecc_fp.c ../../wolfcrypt/src/error.c - ../../wolfcrypt/src/hc128.c ../../wolfcrypt/src/hmac.c ../../wolfcrypt/src/integer.c ../../wolfcrypt/src/logging.c diff --git a/mplabx/user_settings.h b/mplabx/user_settings.h index b89a6f785..9a2ddc254 100644 --- a/mplabx/user_settings.h +++ b/mplabx/user_settings.h @@ -356,9 +356,6 @@ extern "C" { #undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/mplabx/wolfssl.X/nbproject/configurations.xml b/mplabx/wolfssl.X/nbproject/configurations.xml index a07c30598..8b35375d1 100755 --- a/mplabx/wolfssl.X/nbproject/configurations.xml +++ b/mplabx/wolfssl.X/nbproject/configurations.xml @@ -29,7 +29,6 @@ ../../wolfcrypt/src/ecc.c ../../wolfcrypt/src/ecc_fp.c ../../wolfcrypt/src/error.c - ../../wolfcrypt/src/hc128.c ../../wolfcrypt/src/hmac.c ../../wolfcrypt/src/integer.c ../../wolfcrypt/src/logging.c diff --git a/rpm/spec.in b/rpm/spec.in index 86ed37c5d..b562d9fc2 100644 --- a/rpm/spec.in +++ b/rpm/spec.in @@ -100,7 +100,6 @@ mkdir -p $RPM_BUILD_ROOT/ %{_includedir}/cyassl/ctaocrypt/ecc.h %{_includedir}/cyassl/ctaocrypt/error-crypt.h %{_includedir}/cyassl/ctaocrypt/fips_test.h -%{_includedir}/cyassl/ctaocrypt/hc128.h %{_includedir}/cyassl/ctaocrypt/hmac.h %{_includedir}/cyassl/ctaocrypt/integer.h %{_includedir}/cyassl/ctaocrypt/logging.h @@ -271,7 +270,6 @@ mkdir -p $RPM_BUILD_ROOT/ %{_includedir}/wolfssl/wolfcrypt/ge_448.h %{_includedir}/wolfssl/wolfcrypt/ge_operations.h %{_includedir}/wolfssl/wolfcrypt/hash.h -%{_includedir}/wolfssl/wolfcrypt/hc128.h %{_includedir}/wolfssl/wolfcrypt/hmac.h %{_includedir}/wolfssl/wolfcrypt/idea.h %{_includedir}/wolfssl/wolfcrypt/integer.h diff --git a/scripts/memtest.sh b/scripts/memtest.sh index 41fa8edcc..5595ade4a 100755 --- a/scripts/memtest.sh +++ b/scripts/memtest.sh @@ -4,7 +4,7 @@ ./autogen.sh ./configure --enable-debug --disable-shared --enable-memtest \ - --enable-opensslextra --enable-des3 --enable-dh --enable-ecc --enable-aesgcm --enable-aesccm --enable-hc128 \ + --enable-opensslextra --enable-des3 --enable-dh --enable-ecc --enable-aesgcm --enable-aesccm \ --enable-sniffer --enable-psk --enable-rabbit --enable-camellia --enable-sha512 --enable-crl --enable-ocsp --enable-savesession \ --enable-savecert --enable-atomicuser --enable-pkcallbacks --enable-scep; diff --git a/scripts/stm32l4-v4_0_1_build.sh b/scripts/stm32l4-v4_0_1_build.sh index 6d9bdff55..990e0ac1a 100755 --- a/scripts/stm32l4-v4_0_1_build.sh +++ b/scripts/stm32l4-v4_0_1_build.sh @@ -129,7 +129,6 @@ update_user_settings(){ printf '%s\n' "#define NO_RC4"; printf '%s\n' "#define NO_MD4"; printf '%s\n' "#define NO_PSK"; - printf '%s\n' "#define NO_HC128"; printf '%s\n' "#define NO_RABBIT"; printf '%s\n' "#define GCM_SMALL"; printf '%s\n' "#define TFM_ECC256"; diff --git a/src/include.am b/src/include.am index daf320d19..48d07f1c8 100644 --- a/src/include.am +++ b/src/include.am @@ -579,10 +579,6 @@ if BUILD_BLAKE2S src_libwolfssl_la_SOURCES += wolfcrypt/src/blake2s.c endif -if BUILD_HC128 -src_libwolfssl_la_SOURCES += wolfcrypt/src/hc128.c -endif - if BUILD_RABBIT src_libwolfssl_la_SOURCES += wolfcrypt/src/rabbit.c endif diff --git a/src/internal.c b/src/internal.c index 87ad297d0..88b0bfdad 100644 --- a/src/internal.c +++ b/src/internal.c @@ -2526,10 +2526,6 @@ void InitCiphers(WOLFSSL* ssl) ssl->encrypt.cam = NULL; ssl->decrypt.cam = NULL; #endif -#ifdef HAVE_HC128 - ssl->encrypt.hc128 = NULL; - ssl->decrypt.hc128 = NULL; -#endif #ifdef BUILD_RABBIT ssl->encrypt.rabbit = NULL; ssl->decrypt.rabbit = NULL; @@ -2590,10 +2586,6 @@ void FreeCiphers(WOLFSSL* ssl) XFREE(ssl->encrypt.cam, ssl->heap, DYNAMIC_TYPE_CIPHER); XFREE(ssl->decrypt.cam, ssl->heap, DYNAMIC_TYPE_CIPHER); #endif -#ifdef HAVE_HC128 - XFREE(ssl->encrypt.hc128, ssl->heap, DYNAMIC_TYPE_CIPHER); - XFREE(ssl->decrypt.hc128, ssl->heap, DYNAMIC_TYPE_CIPHER); -#endif #ifdef BUILD_RABBIT XFREE(ssl->encrypt.rabbit, ssl->heap, DYNAMIC_TYPE_CIPHER); XFREE(ssl->decrypt.rabbit, ssl->heap, DYNAMIC_TYPE_CIPHER); @@ -3680,20 +3672,6 @@ void InitSuites(Suites* suites, ProtocolVersion pv, int keySz, word16 haveRSA, } #endif -#ifdef BUILD_TLS_RSA_WITH_HC_128_MD5 - if (!dtls && tls && haveRSA) { - suites->suites[idx++] = CIPHER_BYTE; - suites->suites[idx++] = TLS_RSA_WITH_HC_128_MD5; - } -#endif - -#ifdef BUILD_TLS_RSA_WITH_HC_128_SHA - if (!dtls && tls && haveRSA) { - suites->suites[idx++] = CIPHER_BYTE; - suites->suites[idx++] = TLS_RSA_WITH_HC_128_SHA; - } -#endif - #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA if (!dtls && tls && haveRSA) { suites->suites[idx++] = CIPHER_BYTE; @@ -10235,18 +10213,6 @@ static int BuildFinished(WOLFSSL* ssl, Hashes* hashes, const byte* sender) return 1; break; -#ifndef NO_HC128 - case TLS_RSA_WITH_HC_128_MD5 : - if (requirement == REQUIRES_RSA) - return 1; - break; - - case TLS_RSA_WITH_HC_128_SHA : - if (requirement == REQUIRES_RSA) - return 1; - break; -#endif /* NO_HC128 */ - #ifndef NO_RABBIT case TLS_RSA_WITH_RABBIT_SHA : if (requirement == REQUIRES_RSA) @@ -15623,12 +15589,6 @@ static WC_INLINE int EncryptDo(WOLFSSL* ssl, byte* out, const byte* input, break; #endif - #ifdef HAVE_HC128 - case wolfssl_hc128: - ret = wc_Hc128_Process(ssl->encrypt.hc128, out, input, sz); - break; - #endif - #ifdef BUILD_RABBIT case wolfssl_rabbit: ret = wc_RabbitProcess(ssl->encrypt.rabbit, out, input, sz); @@ -15889,12 +15849,6 @@ static WC_INLINE int DecryptDo(WOLFSSL* ssl, byte* plain, const byte* input, break; #endif - #ifdef HAVE_HC128 - case wolfssl_hc128: - ret = wc_Hc128_Process(ssl->decrypt.hc128, plain, input, sz); - break; - #endif - #ifdef BUILD_RABBIT case wolfssl_rabbit: ret = wc_RabbitProcess(ssl->decrypt.rabbit, plain, input, sz); @@ -20946,14 +20900,6 @@ static const CipherSuiteInfo cipher_names[] = SUITE_INFO("PSK-NULL-SHA","TLS_PSK_WITH_NULL_SHA",CIPHER_BYTE,TLS_PSK_WITH_NULL_SHA,TLSv1_MINOR,SSLv3_MAJOR), #endif -#ifdef BUILD_TLS_RSA_WITH_HC_128_MD5 - SUITE_INFO("HC128-MD5","TLS_RSA_WITH_HC_128_MD5",CIPHER_BYTE,TLS_RSA_WITH_HC_128_MD5,TLSv1_MINOR,SSLv3_MAJOR), -#endif - -#ifdef BUILD_TLS_RSA_WITH_HC_128_SHA - SUITE_INFO("HC128-SHA","TLS_RSA_WITH_HC_128_SHA",CIPHER_BYTE,TLS_RSA_WITH_HC_128_SHA,TLSv1_MINOR,SSLv3_MAJOR), -#endif - #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA SUITE_INFO("RABBIT-SHA","TLS_RSA_WITH_RABBIT_SHA",CIPHER_BYTE,TLS_RSA_WITH_RABBIT_SHA,TLSv1_MINOR,SSLv3_MAJOR), #endif @@ -21466,8 +21412,6 @@ const char* GetCipherEncStr(char n[][MAX_SEGMENT_SZ]) { encStr = "IDEA"; else if ((XSTRNCMP(n0,"RABBIT",4) == 0)) encStr = "RABBIT"; - else if ((XSTRNCMP(n0,"HC128",5) == 0)) - encStr = "HC128"; else encStr = "unknown"; @@ -21690,7 +21634,6 @@ int SetCipherList(WOLFSSL_CTX* ctx, Suites* suites, const char* list) /* don't allow stream ciphers with DTLS */ if (ctx->method->version.major == DTLS_MAJOR) { if (XSTRSTR(name, "RC4") || - XSTRSTR(name, "HC128") || XSTRSTR(name, "RABBIT")) { WOLFSSL_MSG("Stream ciphers not supported with DTLS"); diff --git a/src/keys.c b/src/keys.c index b5bef34e0..b46a9eaa7 100644 --- a/src/keys.c +++ b/src/keys.c @@ -1783,40 +1783,6 @@ int SetCipherSpecs(WOLFSSL* ssl) break; #endif -#ifdef BUILD_TLS_RSA_WITH_HC_128_MD5 - case TLS_RSA_WITH_HC_128_MD5 : - ssl->specs.bulk_cipher_algorithm = wolfssl_hc128; - ssl->specs.cipher_type = stream; - ssl->specs.mac_algorithm = md5_mac; - ssl->specs.kea = rsa_kea; - ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = WC_MD5_DIGEST_SIZE; - ssl->specs.pad_size = PAD_MD5; - ssl->specs.static_ecdh = 0; - ssl->specs.key_size = HC_128_KEY_SIZE; - ssl->specs.block_size = 0; - ssl->specs.iv_size = HC_128_IV_SIZE; - - break; -#endif - -#ifdef BUILD_TLS_RSA_WITH_HC_128_SHA - case TLS_RSA_WITH_HC_128_SHA : - ssl->specs.bulk_cipher_algorithm = wolfssl_hc128; - ssl->specs.cipher_type = stream; - ssl->specs.mac_algorithm = sha_mac; - ssl->specs.kea = rsa_kea; - ssl->specs.sig_algo = rsa_sa_algo; - ssl->specs.hash_size = WC_SHA_DIGEST_SIZE; - ssl->specs.pad_size = PAD_SHA; - ssl->specs.static_ecdh = 0; - ssl->specs.key_size = HC_128_KEY_SIZE; - ssl->specs.block_size = 0; - ssl->specs.iv_size = HC_128_IV_SIZE; - - break; -#endif - #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA case TLS_RSA_WITH_RABBIT_SHA : ssl->specs.bulk_cipher_algorithm = wolfssl_rabbit; @@ -2299,56 +2265,6 @@ static int SetKeys(Ciphers* enc, Ciphers* dec, Keys* keys, CipherSpecs* specs, } #endif /* HAVE_CHACHA && HAVE_POLY1305 */ - -#ifdef HAVE_HC128 - /* check that buffer sizes are sufficient */ - #if (MAX_WRITE_IV_SZ < 16) /* HC_128_IV_SIZE */ - #error MAX_WRITE_IV_SZ too small for HC128 - #endif - - if (specs->bulk_cipher_algorithm == wolfssl_hc128) { - int hcRet; - if (enc && enc->hc128 == NULL) - enc->hc128 = - (HC128*)XMALLOC(sizeof(HC128), heap, DYNAMIC_TYPE_CIPHER); - if (enc && enc->hc128 == NULL) - return MEMORY_E; - if (dec && dec->hc128 == NULL) - dec->hc128 = - (HC128*)XMALLOC(sizeof(HC128), heap, DYNAMIC_TYPE_CIPHER); - if (dec && dec->hc128 == NULL) - return MEMORY_E; - if (side == WOLFSSL_CLIENT_END) { - if (enc) { - hcRet = wc_Hc128_SetKey(enc->hc128, keys->client_write_key, - keys->client_write_IV); - if (hcRet != 0) return hcRet; - } - if (dec) { - hcRet = wc_Hc128_SetKey(dec->hc128, keys->server_write_key, - keys->server_write_IV); - if (hcRet != 0) return hcRet; - } - } - else { - if (enc) { - hcRet = wc_Hc128_SetKey(enc->hc128, keys->server_write_key, - keys->server_write_IV); - if (hcRet != 0) return hcRet; - } - if (dec) { - hcRet = wc_Hc128_SetKey(dec->hc128, keys->client_write_key, - keys->client_write_IV); - if (hcRet != 0) return hcRet; - } - } - if (enc) - enc->setup = 1; - if (dec) - dec->setup = 1; - } -#endif /* HAVE_HC128 */ - #ifdef BUILD_RABBIT /* check that buffer sizes are sufficient */ #if (MAX_WRITE_IV_SZ < 8) /* RABBIT_IV_SIZE */ diff --git a/src/sniffer.c b/src/sniffer.c index 65d87e9f6..1fee4f825 100644 --- a/src/sniffer.c +++ b/src/sniffer.c @@ -4291,12 +4291,6 @@ static int Decrypt(WOLFSSL* ssl, byte* output, const byte* input, word32 sz) break; #endif - #ifdef HAVE_HC128 - case wolfssl_hc128: - wc_Hc128_Process(ssl->decrypt.hc128, output, input, sz); - break; - #endif - #ifdef BUILD_RABBIT case wolfssl_rabbit: wc_RabbitProcess(ssl->decrypt.rabbit, output, input, sz); diff --git a/src/ssl.c b/src/ssl.c index 985ce7baf..4f511eebd 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -25693,7 +25693,6 @@ int wolfSSL_CIPHER_get_cipher_nid(const WOLFSSL_CIPHER* cipher) {"None", NID_undef}, {"IDEA", NID_idea_cbc}, {"RABBIT", NID_undef}, - {"HC128", NID_undef}, {NULL, NID_undef} }; @@ -26099,11 +26098,6 @@ static WC_INLINE const char* wolfssl_cipher_to_string(int cipher, int key_size) encStr = "Camellia(?)"; break; #endif -#if defined(HAVE_HC128) && !defined(NO_HC128) - case wolfssl_hc128: - encStr = "HC128(128)"; - break; -#endif #if defined(HAVE_RABBIT) && !defined(NO_RABBIT) case wolfssl_rabbit: encStr = "RABBIT(128)"; diff --git a/tests/api.c b/tests/api.c index cd0a36e68..6b7426136 100644 --- a/tests/api.c +++ b/tests/api.c @@ -231,10 +231,6 @@ #include #endif -#ifdef HAVE_HC128 - #include -#endif - #ifdef HAVE_PKCS7 #include #include @@ -686,7 +682,7 @@ static void test_for_double_Free(void) "AES128-CBC-SHA256:PSK-AES128-CBC-SHA:PSK-AES256-CBC-SHA:DHE-PSK-AES128-CCM:DHE" "-PSK-AES256-CCM:PSK-AES128-CCM:PSK-AES256-CCM:PSK-AES128-CCM-8:PSK-AES256-CCM-" "8:DHE-PSK-NULL-SHA384:DHE-PSK-NULL-SHA256:PSK-NULL-SHA384:PSK-NULL-SHA256:PSK-" -"NULL-SHA:HC128-MD5:HC128-SHA:RABBIT-SHA:AES128-CCM-8:AES256-CCM-8:ECDHE-ECDSA-" +"NULL-SHA:RABBIT-SHA:AES128-CCM-8:AES256-CCM-8:ECDHE-ECDSA-" "AES128-CCM:ECDHE-ECDSA-AES128-CCM-8:ECDHE-ECDSA-AES256-CCM-8:ECDHE-RSA-AES128-" "SHA:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-R" "SA-RC4-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-RC4-SHA:ECDHE-ECDSA-DES-CBC3-SHA" @@ -20069,93 +20065,6 @@ static int test_wc_AesCcmEncryptDecrypt (void) } /* END test_wc_AesCcmEncryptDecrypt */ - -/* - * Test wc_Hc128_SetKey() - */ -static int test_wc_Hc128_SetKey (void) -{ - int ret = 0; -#ifdef HAVE_HC128 - HC128 ctx; - const char* key = "\x80\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x00\x00\x00"; - const char* iv = "\x0D\x74\xDB\x42\xA9\x10\x77\xDE" - "\x45\xAC\x13\x7A\xE1\x48\xAF\x16"; - - printf(testingFmt, "wc_Hc128_SetKey()"); - ret = wc_Hc128_SetKey(&ctx, (byte*)key, (byte*)iv); - /* Test bad args. */ - if (ret == 0) { - ret = wc_Hc128_SetKey(NULL, (byte*)key, (byte*)iv); - if (ret == BAD_FUNC_ARG) { - ret = wc_Hc128_SetKey(&ctx, NULL, (byte*)iv); - } - if (ret == BAD_FUNC_ARG) { - ret = wc_Hc128_SetKey(&ctx, (byte*)key, NULL); - } - } - - printf(resultFmt, ret == 0 ? passed : failed); - - -#endif - return ret; - -} /* END test_wc_Hc128_SetKey */ - -/* - * Testing wc_Hc128_Process() - */ -static int test_wc_Hc128_Process (void) -{ - int ret = 0; -#ifdef HAVE_HC128 - HC128 enc; - HC128 dec; - const char* key = "\x0F\x62\xB5\x08\x5B\xAE\x01\x54" - "\xA7\xFA\x4D\xA0\xF3\x46\x99\xEC"; - const char* input = "Encrypt Hc128, and then Decrypt."; - size_t inlen = XSTRLEN(input) + 1; /* Add null terminator */ - byte cipher[inlen]; - byte plain[inlen]; - - printf(testingFmt, "wc_Hc128_Process()"); - ret = wc_Hc128_SetKey(&enc, (byte*)key, NULL); - if (ret == 0) { - ret = wc_Hc128_SetKey(&dec, (byte*)key, NULL); - } - if (ret == 0) { - ret = wc_Hc128_Process(&enc, cipher, (byte*)input, (word32)inlen); - if (ret == 0) { - ret = wc_Hc128_Process(&dec, plain, cipher, (word32)inlen); - } - } - - /* Bad args. */ - if (ret == 0) { - ret = wc_Hc128_Process(NULL, plain, cipher, (word32)inlen); - if (ret == BAD_FUNC_ARG) { - ret = wc_Hc128_Process(&dec, NULL, cipher, (word32)inlen); - } - if (ret == BAD_FUNC_ARG) { - ret = wc_Hc128_Process(&dec, plain, NULL, (word32)inlen); - } - if (ret == BAD_FUNC_ARG) { - ret = 0; - } else { - ret = WOLFSSL_FATAL_ERROR; - } - } - - printf(resultFmt, ret == 0 ? passed : failed); - - #endif - return ret; - -} /* END test_wc_Hc128_Process */ - - /* * Testing wc_InitDsaKey() */ @@ -52874,8 +52783,6 @@ void ApiTest(void) AssertIntEQ(test_RsaDecryptBoundsCheck(), 0); AssertIntEQ(test_wc_AesCcmSetKey(), 0); AssertIntEQ(test_wc_AesCcmEncryptDecrypt(), 0); - AssertIntEQ(test_wc_Hc128_SetKey(), 0); - AssertIntEQ(test_wc_Hc128_Process(), 0); AssertIntEQ(test_wc_InitDsaKey(), 0); AssertIntEQ(test_wc_DsaSignVerify(), 0); AssertIntEQ(test_wc_DsaPublicPrivateKeyDecode(), 0); diff --git a/tests/test.conf b/tests/test.conf index 42d6d6026..63c0750e3 100644 --- a/tests/test.conf +++ b/tests/test.conf @@ -859,54 +859,6 @@ -l ECDH-ECDSA-AES256-SHA384 -A ./certs/ca-ecc-cert.pem -# server TLSv1 HC128-SHA --v 1 --l HC128-SHA - -# client TLSv1 HC128-SHA --v 1 --l HC128-SHA - -# server TLSv1 HC128-MD5 --v 1 --l HC128-MD5 - -# client TLSv1 HC128-MD5 --v 1 --l HC128-MD5 - -# server TLSv1.1 HC128-SHA --v 2 --l HC128-SHA - -# client TLSv1.1 HC128-SHA --v 2 --l HC128-SHA - -# server TLSv1.1 HC128-MD5 --v 2 --l HC128-MD5 - -# client TLSv1.1 HC128-MD5 --v 2 --l HC128-MD5 - -# server TLSv1.2 HC128-SHA --v 3 --l HC128-SHA - -# client TLSv1.2 HC128-SHA --v 3 --l HC128-SHA - -# server TLSv1.2 HC128-MD5 --v 3 --l HC128-MD5 - -# client TLSv1.2 HC128-MD5 --v 3 --l HC128-MD5 - # server TLSv1 RABBIT-SHA -v 1 -l RABBIT-SHA diff --git a/tirtos/packages/ti/net/wolfssl/package.bld b/tirtos/packages/ti/net/wolfssl/package.bld index 7f2ef948d..9610b424c 100644 --- a/tirtos/packages/ti/net/wolfssl/package.bld +++ b/tirtos/packages/ti/net/wolfssl/package.bld @@ -23,7 +23,6 @@ var wolfSSLObjList = [ "wolfcrypt/src/dsa.c", "wolfcrypt/src/ecc.c", "wolfcrypt/src/error.c", - "wolfcrypt/src/hc128.c", "wolfcrypt/src/hmac.c", "wolfcrypt/src/hash.c", "wolfcrypt/src/integer.c", diff --git a/wolfcrypt/benchmark/README.md b/wolfcrypt/benchmark/README.md index fc01f377b..1e9c9d23d 100644 --- a/wolfcrypt/benchmark/README.md +++ b/wolfcrypt/benchmark/README.md @@ -23,7 +23,7 @@ benchmark Measure RSA performance. - Algorithm to benchmark. Available algorithms include: cipher aes-cbc aes-gcm aes-ecb aes-xts aes-cfb aes-ctr aes-ccm - camellia arc4 hc128 rabbit chacha20 chacha20-poly1305 des idea + camellia arc4 rabbit chacha20 chacha20-poly1305 des idea digest md5 poly1305 sha sha2 sha224 sha256 sha384 sha512 sha3 sha3-224 sha3-256 sha3-384 sha3-512 ripemd mac cmac hmac hmac-md5 hmac-sha hmac-sha224 hmac-sha256 diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index 54f697ef2..8560e00a0 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -152,7 +152,6 @@ #include #include #include -#include #include #include #include @@ -276,7 +275,6 @@ #define BENCH_AES_CCM 0x00000020 #define BENCH_CAMELLIA 0x00000100 #define BENCH_ARC4 0x00000200 -#define BENCH_HC128 0x00000400 #define BENCH_RABBIT 0x00000800 #define BENCH_CHACHA20 0x00001000 #define BENCH_CHACHA20_POLY1305 0x00002000 @@ -442,9 +440,6 @@ static const bench_alg bench_cipher_opt[] = { #ifndef NO_RC4 { "-arc4", BENCH_ARC4 }, #endif -#ifdef HAVE_HC128 - { "-hc128", BENCH_HC128 }, -#endif #ifndef NO_RABBIT { "-rabbit", BENCH_RABBIT }, #endif @@ -1752,10 +1747,6 @@ static void* benchmarks_do(void* args) #endif } #endif -#ifdef HAVE_HC128 - if (bench_all || (bench_cipher_algs & BENCH_HC128)) - bench_hc128(); -#endif #ifndef NO_RABBIT if (bench_all || (bench_cipher_algs & BENCH_RABBIT)) bench_rabbit(); @@ -3393,27 +3384,6 @@ exit: #endif /* !NO_RC4 */ -#ifdef HAVE_HC128 -void bench_hc128(void) -{ - HC128 enc; - double start; - int i, count; - - wc_Hc128_SetKey(&enc, bench_key, bench_iv); - - bench_stats_start(&count, &start); - do { - for (i = 0; i < numBlocks; i++) { - wc_Hc128_Process(&enc, bench_cipher, bench_plain, BENCH_SIZE); - } - count += i; - } while (bench_stats_sym_check(start)); - bench_stats_sym_finish("HC128", 0, count, bench_size, start, 0); -} -#endif /* HAVE_HC128 */ - - #ifndef NO_RABBIT void bench_rabbit(void) { diff --git a/wolfcrypt/benchmark/benchmark.h b/wolfcrypt/benchmark/benchmark.h index 34380ba02..5b0d1c922 100644 --- a/wolfcrypt/benchmark/benchmark.h +++ b/wolfcrypt/benchmark/benchmark.h @@ -43,7 +43,6 @@ void benchmark_configure(int block_size); void bench_des(int); void bench_idea(void); void bench_arc4(int); -void bench_hc128(void); void bench_rabbit(void); void bench_chacha(void); void bench_chacha20_poly1305_aead(void); diff --git a/wolfcrypt/src/hc128.c b/wolfcrypt/src/hc128.c deleted file mode 100644 index d2bdeb522..000000000 --- a/wolfcrypt/src/hc128.c +++ /dev/null @@ -1,436 +0,0 @@ -/* hc128.c - * - * Copyright (C) 2006-2021 wolfSSL Inc. - * - * This file is part of wolfSSL. - * - * wolfSSL is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * wolfSSL is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA - */ - - -#ifdef HAVE_CONFIG_H - #include -#endif - -#include - -#ifdef HAVE_HC128 - -#include -#include -#include -#ifdef NO_INLINE - #include - #include -#else - #define WOLFSSL_MISC_INCLUDED - #include -#endif - - -#define LOAD_LE32(a) \ - (((word32)(a)[0] << 0) | \ - ((word32)(a)[1] << 8) | \ - ((word32)(a)[2] << 16) | \ - ((word32)(a)[3] << 24)) - -#ifdef BIG_ENDIAN_ORDER - #define LITTLE32(x) ByteReverseWord32(x) -#else - #define LITTLE32(x) (x) -#endif - - -/*h1 function*/ -#define h1(ctx, x, y) { \ - byte a,c; \ - a = (byte) (x); \ - c = (byte) ((x) >> 16); \ - y = (ctx->T[512+a])+(ctx->T[512+256+c]); \ -} - -/*h2 function*/ -#define h2(ctx, x, y) { \ - byte a,c; \ - a = (byte) (x); \ - c = (byte) ((x) >> 16); \ - y = (ctx->T[a])+(ctx->T[256+c]); \ -} - -/*one step of HC-128, update P and generate 32 bits keystream*/ -#define step_P(ctx,u,v,a,b,c,d,n){ \ - word32 tem0,tem1,tem2,tem3; \ - h1((ctx),(ctx->X[(d)]),tem3); \ - tem0 = rotrFixed((ctx->T[(v)]),23); \ - tem1 = rotrFixed((ctx->X[(c)]),10); \ - tem2 = rotrFixed((ctx->X[(b)]),8); \ - (ctx->T[(u)]) += tem2+(tem0 ^ tem1); \ - (ctx->X[(a)]) = (ctx->T[(u)]); \ - (n) = tem3 ^ (ctx->T[(u)]) ; \ -} - -/*one step of HC-128, update Q and generate 32 bits keystream*/ -#define step_Q(ctx,u,v,a,b,c,d,n){ \ - word32 tem0,tem1,tem2,tem3; \ - h2((ctx),(ctx->Y[(d)]),tem3); \ - tem0 = rotrFixed((ctx->T[(v)]),(32-23)); \ - tem1 = rotrFixed((ctx->Y[(c)]),(32-10)); \ - tem2 = rotrFixed((ctx->Y[(b)]),(32-8)); \ - (ctx->T[(u)]) += tem2 + (tem0 ^ tem1); \ - (ctx->Y[(a)]) = (ctx->T[(u)]); \ - (n) = tem3 ^ (ctx->T[(u)]) ; \ -} - -/*16 steps of HC-128, generate 512 bits keystream*/ -static void generate_keystream(HC128* ctx, word32* keystream) -{ - word32 cc,dd; - cc = ctx->counter1024 & 0x1ff; - dd = (cc+16)&0x1ff; - - if (ctx->counter1024 < 512) - { - ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; - step_P(ctx, cc+0, cc+1, 0, 6, 13,4, keystream[0]); - step_P(ctx, cc+1, cc+2, 1, 7, 14,5, keystream[1]); - step_P(ctx, cc+2, cc+3, 2, 8, 15,6, keystream[2]); - step_P(ctx, cc+3, cc+4, 3, 9, 0, 7, keystream[3]); - step_P(ctx, cc+4, cc+5, 4, 10,1, 8, keystream[4]); - step_P(ctx, cc+5, cc+6, 5, 11,2, 9, keystream[5]); - step_P(ctx, cc+6, cc+7, 6, 12,3, 10,keystream[6]); - step_P(ctx, cc+7, cc+8, 7, 13,4, 11,keystream[7]); - step_P(ctx, cc+8, cc+9, 8, 14,5, 12,keystream[8]); - step_P(ctx, cc+9, cc+10,9, 15,6, 13,keystream[9]); - step_P(ctx, cc+10,cc+11,10,0, 7, 14,keystream[10]); - step_P(ctx, cc+11,cc+12,11,1, 8, 15,keystream[11]); - step_P(ctx, cc+12,cc+13,12,2, 9, 0, keystream[12]); - step_P(ctx, cc+13,cc+14,13,3, 10,1, keystream[13]); - step_P(ctx, cc+14,cc+15,14,4, 11,2, keystream[14]); - step_P(ctx, cc+15,dd+0, 15,5, 12,3, keystream[15]); - } - else - { - ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; - step_Q(ctx, 512+cc+0, 512+cc+1, 0, 6, 13,4, keystream[0]); - step_Q(ctx, 512+cc+1, 512+cc+2, 1, 7, 14,5, keystream[1]); - step_Q(ctx, 512+cc+2, 512+cc+3, 2, 8, 15,6, keystream[2]); - step_Q(ctx, 512+cc+3, 512+cc+4, 3, 9, 0, 7, keystream[3]); - step_Q(ctx, 512+cc+4, 512+cc+5, 4, 10,1, 8, keystream[4]); - step_Q(ctx, 512+cc+5, 512+cc+6, 5, 11,2, 9, keystream[5]); - step_Q(ctx, 512+cc+6, 512+cc+7, 6, 12,3, 10,keystream[6]); - step_Q(ctx, 512+cc+7, 512+cc+8, 7, 13,4, 11,keystream[7]); - step_Q(ctx, 512+cc+8, 512+cc+9, 8, 14,5, 12,keystream[8]); - step_Q(ctx, 512+cc+9, 512+cc+10,9, 15,6, 13,keystream[9]); - step_Q(ctx, 512+cc+10,512+cc+11,10,0, 7, 14,keystream[10]); - step_Q(ctx, 512+cc+11,512+cc+12,11,1, 8, 15,keystream[11]); - step_Q(ctx, 512+cc+12,512+cc+13,12,2, 9, 0, keystream[12]); - step_Q(ctx, 512+cc+13,512+cc+14,13,3, 10,1, keystream[13]); - step_Q(ctx, 512+cc+14,512+cc+15,14,4, 11,2, keystream[14]); - step_Q(ctx, 512+cc+15,512+dd+0, 15,5, 12,3, keystream[15]); - } -} - - -/* The following defines the initialization functions */ -#define f1(x) (rotrFixed((x),7) ^ rotrFixed((x),18) ^ ((x) >> 3)) -#define f2(x) (rotrFixed((x),17) ^ rotrFixed((x),19) ^ ((x) >> 10)) - -/*update table P*/ -#define update_P(ctx,u,v,a,b,c,d){ \ - word32 tem0,tem1,tem2,tem3; \ - tem0 = rotrFixed((ctx->T[(v)]),23); \ - tem1 = rotrFixed((ctx->X[(c)]),10); \ - tem2 = rotrFixed((ctx->X[(b)]),8); \ - h1((ctx),(ctx->X[(d)]),tem3); \ - (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; \ - (ctx->X[(a)]) = (ctx->T[(u)]); \ -} - -/*update table Q*/ -#define update_Q(ctx,u,v,a,b,c,d){ \ - word32 tem0,tem1,tem2,tem3; \ - tem0 = rotrFixed((ctx->T[(v)]),(32-23)); \ - tem1 = rotrFixed((ctx->Y[(c)]),(32-10)); \ - tem2 = rotrFixed((ctx->Y[(b)]),(32-8)); \ - h2((ctx),(ctx->Y[(d)]),tem3); \ - (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; \ - (ctx->Y[(a)]) = (ctx->T[(u)]); \ -} - -/*16 steps of HC-128, without generating keystream, */ -/*but use the outputs to update P and Q*/ -static void setup_update(HC128* ctx) /*each time 16 steps*/ -{ - word32 cc,dd; - cc = ctx->counter1024 & 0x1ff; - dd = (cc+16)&0x1ff; - - if (ctx->counter1024 < 512) - { - ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; - update_P(ctx, cc+0, cc+1, 0, 6, 13, 4); - update_P(ctx, cc+1, cc+2, 1, 7, 14, 5); - update_P(ctx, cc+2, cc+3, 2, 8, 15, 6); - update_P(ctx, cc+3, cc+4, 3, 9, 0, 7); - update_P(ctx, cc+4, cc+5, 4, 10,1, 8); - update_P(ctx, cc+5, cc+6, 5, 11,2, 9); - update_P(ctx, cc+6, cc+7, 6, 12,3, 10); - update_P(ctx, cc+7, cc+8, 7, 13,4, 11); - update_P(ctx, cc+8, cc+9, 8, 14,5, 12); - update_P(ctx, cc+9, cc+10,9, 15,6, 13); - update_P(ctx, cc+10,cc+11,10,0, 7, 14); - update_P(ctx, cc+11,cc+12,11,1, 8, 15); - update_P(ctx, cc+12,cc+13,12,2, 9, 0); - update_P(ctx, cc+13,cc+14,13,3, 10, 1); - update_P(ctx, cc+14,cc+15,14,4, 11, 2); - update_P(ctx, cc+15,dd+0, 15,5, 12, 3); - } - else - { - ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; - update_Q(ctx, 512+cc+0, 512+cc+1, 0, 6, 13, 4); - update_Q(ctx, 512+cc+1, 512+cc+2, 1, 7, 14, 5); - update_Q(ctx, 512+cc+2, 512+cc+3, 2, 8, 15, 6); - update_Q(ctx, 512+cc+3, 512+cc+4, 3, 9, 0, 7); - update_Q(ctx, 512+cc+4, 512+cc+5, 4, 10,1, 8); - update_Q(ctx, 512+cc+5, 512+cc+6, 5, 11,2, 9); - update_Q(ctx, 512+cc+6, 512+cc+7, 6, 12,3, 10); - update_Q(ctx, 512+cc+7, 512+cc+8, 7, 13,4, 11); - update_Q(ctx, 512+cc+8, 512+cc+9, 8, 14,5, 12); - update_Q(ctx, 512+cc+9, 512+cc+10,9, 15,6, 13); - update_Q(ctx, 512+cc+10,512+cc+11,10,0, 7, 14); - update_Q(ctx, 512+cc+11,512+cc+12,11,1, 8, 15); - update_Q(ctx, 512+cc+12,512+cc+13,12,2, 9, 0); - update_Q(ctx, 512+cc+13,512+cc+14,13,3, 10, 1); - update_Q(ctx, 512+cc+14,512+cc+15,14,4, 11, 2); - update_Q(ctx, 512+cc+15,512+dd+0, 15,5, 12, 3); - } -} - - -/* for the 128-bit key: key[0]...key[15] -* key[0] is the least significant byte of ctx->key[0] (K_0); -* key[3] is the most significant byte of ctx->key[0] (K_0); -* ... -* key[12] is the least significant byte of ctx->key[3] (K_3) -* key[15] is the most significant byte of ctx->key[3] (K_3) -* -* for the 128-bit iv: iv[0]...iv[15] -* iv[0] is the least significant byte of ctx->iv[0] (IV_0); -* iv[3] is the most significant byte of ctx->iv[0] (IV_0); -* ... -* iv[12] is the least significant byte of ctx->iv[3] (IV_3) -* iv[15] is the most significant byte of ctx->iv[3] (IV_3) -*/ - - - -static void Hc128_SetIV(HC128* ctx, const byte* inIv) -{ - word32 i; - word32 iv[4]; - - if (inIv) - XMEMCPY(iv, inIv, sizeof(iv)); - else - XMEMSET(iv, 0, sizeof(iv)); - - for (i = 0; i < (128 >> 5); i++) - ctx->iv[i] = LITTLE32(iv[i]); - - for (; i < 8; i++) ctx->iv[i] = ctx->iv[i-4]; - - /* expand the key and IV into the table T */ - /* (expand the key and IV into the table P and Q) */ - - for (i = 0; i < 8; i++) ctx->T[i] = ctx->key[i]; - for (i = 8; i < 16; i++) ctx->T[i] = ctx->iv[i-8]; - - for (i = 16; i < (256+16); i++) - ctx->T[i] = f2(ctx->T[i-2]) + ctx->T[i-7] + f1(ctx->T[i-15]) + - ctx->T[i-16]+i; - - for (i = 0; i < 16; i++) ctx->T[i] = ctx->T[256+i]; - - for (i = 16; i < 1024; i++) - ctx->T[i] = f2(ctx->T[i-2]) + ctx->T[i-7] + f1(ctx->T[i-15]) + - ctx->T[i-16]+256+i; - - /* initialize counter1024, X and Y */ - ctx->counter1024 = 0; - for (i = 0; i < 16; i++) ctx->X[i] = ctx->T[512-16+i]; - for (i = 0; i < 16; i++) ctx->Y[i] = ctx->T[512+512-16+i]; - - /* run the cipher 1024 steps before generating the output */ - for (i = 0; i < 64; i++) setup_update(ctx); -} - -#define HC128_KEY_NUMBYTES (128 >> 5) -static WC_INLINE int DoKey(HC128* ctx, const byte* key, const byte* iv) -{ - word32 i; - - /* Key size in bits 128 */ - for (i = 0; i < HC128_KEY_NUMBYTES; i++) - ctx->key[i] = LOAD_LE32(key + i * 4); - - for ( ; i < 8 ; i++) ctx->key[i] = ctx->key[i-4]; - - Hc128_SetIV(ctx, iv); - - return 0; -} - - -int wc_Hc128_SetHeap(HC128* ctx, void* heap) -{ - if (ctx == NULL) { - return BAD_FUNC_ARG; - } - -#ifdef XSTREAM_ALIGN - ctx->heap = heap; -#endif - - (void)heap; - return 0; -} - -/* Key setup */ -int wc_Hc128_SetKey(HC128* ctx, const byte* key, const byte* iv) -{ - if (ctx == NULL || key == NULL) { - return BAD_FUNC_ARG; - } - -#ifdef XSTREAM_ALIGN - /* default heap to NULL or heap test value */ - #ifdef WOLFSSL_HEAP_TEST - ctx->heap = (void*)WOLFSSL_HEAP_TEST; - #else - ctx->heap = NULL; - #endif /* WOLFSSL_HEAP_TEST */ - - if ((wc_ptr_t)key % 4) { - int alignKey[4]; - - /* iv gets aligned in SetIV */ - WOLFSSL_MSG("Hc128SetKey unaligned key"); - - XMEMCPY(alignKey, key, sizeof(alignKey)); - - return DoKey(ctx, (const byte*)alignKey, iv); - } -#endif /* XSTREAM_ALIGN */ - - return DoKey(ctx, key, iv); -} - - - -/* The following defines the encryption of data stream */ -static WC_INLINE int DoProcess(HC128* ctx, byte* output, const byte* input, - word32 msglen) -{ - word32 i, keystream[16]; - - for ( ; msglen >= 64; msglen -= 64, input += 64, output += 64) - { - generate_keystream(ctx, keystream); - - /* unroll loop */ - ((word32*)output)[0] = ((word32*)input)[0] ^ LITTLE32(keystream[0]); - ((word32*)output)[1] = ((word32*)input)[1] ^ LITTLE32(keystream[1]); - ((word32*)output)[2] = ((word32*)input)[2] ^ LITTLE32(keystream[2]); - ((word32*)output)[3] = ((word32*)input)[3] ^ LITTLE32(keystream[3]); - ((word32*)output)[4] = ((word32*)input)[4] ^ LITTLE32(keystream[4]); - ((word32*)output)[5] = ((word32*)input)[5] ^ LITTLE32(keystream[5]); - ((word32*)output)[6] = ((word32*)input)[6] ^ LITTLE32(keystream[6]); - ((word32*)output)[7] = ((word32*)input)[7] ^ LITTLE32(keystream[7]); - ((word32*)output)[8] = ((word32*)input)[8] ^ LITTLE32(keystream[8]); - ((word32*)output)[9] = ((word32*)input)[9] ^ LITTLE32(keystream[9]); - ((word32*)output)[10] = ((word32*)input)[10] ^ LITTLE32(keystream[10]); - ((word32*)output)[11] = ((word32*)input)[11] ^ LITTLE32(keystream[11]); - ((word32*)output)[12] = ((word32*)input)[12] ^ LITTLE32(keystream[12]); - ((word32*)output)[13] = ((word32*)input)[13] ^ LITTLE32(keystream[13]); - ((word32*)output)[14] = ((word32*)input)[14] ^ LITTLE32(keystream[14]); - ((word32*)output)[15] = ((word32*)input)[15] ^ LITTLE32(keystream[15]); - } - - if (msglen > 0) - { - XMEMSET(keystream, 0, sizeof(keystream)); /* hush the static analysis */ - generate_keystream(ctx, keystream); - -#ifdef BIG_ENDIAN_ORDER - { - word32 wordsLeft = msglen / sizeof(word32); - if (msglen % sizeof(word32)) wordsLeft++; - - ByteReverseWords(keystream, keystream, wordsLeft * sizeof(word32)); - } -#endif - - for (i = 0; i < msglen; i++) - output[i] = input[i] ^ ((byte*)keystream)[i]; - } - - return 0; -} - - -/* Encrypt/decrypt a message of any size */ -int wc_Hc128_Process(HC128* ctx, byte* output, const byte* input, word32 msglen) -{ - if (ctx == NULL || output == NULL || input == NULL) { - return BAD_FUNC_ARG; - } - -#ifdef XSTREAM_ALIGN - if ((wc_ptr_t)input % 4 || (wc_ptr_t)output % 4) { - #ifndef NO_WOLFSSL_ALLOC_ALIGN - byte* tmp; - WOLFSSL_MSG("Hc128Process unaligned"); - - tmp = (byte*)XMALLOC(msglen, ctx->heap, DYNAMIC_TYPE_TMP_BUFFER); - if (tmp == NULL) return MEMORY_E; - - XMEMCPY(tmp, input, msglen); - DoProcess(ctx, tmp, tmp, msglen); - XMEMCPY(output, tmp, msglen); - - XFREE(tmp, ctx->heap, DYNAMIC_TYPE_TMP_BUFFER); - - return 0; - #else - return BAD_ALIGN_E; - #endif - } -#endif /* XSTREAM_ALIGN */ - - return DoProcess(ctx, output, input, msglen); -} - - -#else /* HAVE_HC128 */ - - -#ifdef _MSC_VER - /* 4206 warning for blank file */ - #pragma warning(disable: 4206) -#endif - - -#endif /* HAVE_HC128 */ diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 718f93b25..6b532801d 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -239,7 +239,6 @@ #include #include #include -#include #include #include #include @@ -411,7 +410,6 @@ WOLFSSL_TEST_SUBROUTINE int arc4_test(void); #ifdef WC_RC2 WOLFSSL_TEST_SUBROUTINE int rc2_test(void); #endif -WOLFSSL_TEST_SUBROUTINE int hc128_test(void); WOLFSSL_TEST_SUBROUTINE int rabbit_test(void); WOLFSSL_TEST_SUBROUTINE int chacha_test(void); WOLFSSL_TEST_SUBROUTINE int XChaCha_test(void); @@ -1031,13 +1029,6 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\ TEST_PASS("ARC4 test passed!\n"); #endif -#ifndef NO_HC128 - if ( (ret = hc128_test()) != 0) - return err_sys("HC-128 test failed!\n", ret); - else - TEST_PASS("HC-128 test passed!\n"); -#endif - #ifndef NO_RABBIT if ( (ret = rabbit_test()) != 0) return err_sys("Rabbit test failed!\n", ret); @@ -5048,119 +5039,6 @@ WOLFSSL_TEST_SUBROUTINE int arc4_test(void) } #endif - -WOLFSSL_TEST_SUBROUTINE int hc128_test(void) -{ -#ifdef HAVE_HC128 - byte cipher[16]; - byte plain[16]; - - const char* keys[] = - { - "\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", - "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", - "\x00\x53\xA6\xF9\x4C\x9F\xF2\x45\x98\xEB\x3E\x91\xE4\x37\x8A\xDD", - "\x0F\x62\xB5\x08\x5B\xAE\x01\x54\xA7\xFA\x4D\xA0\xF3\x46\x99\xEC" - }; - - const char* ivs[] = - { - "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", - "\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", - "\x0D\x74\xDB\x42\xA9\x10\x77\xDE\x45\xAC\x13\x7A\xE1\x48\xAF\x16", - "\x28\x8F\xF6\x5D\xC4\x2B\x92\xF9\x60\xC7\x2E\x95\xFC\x63\xCA\x31" - }; - - - testVector a, b, c, d; - testVector test_hc128[4]; - - int times = sizeof(test_hc128) / sizeof(testVector), i; - - int ret = 0; -#if !defined(WOLFSSL_SMALL_STACK) || defined(WOLFSSL_NO_MALLOC) - HC128 enc[1], dec[1]; -#else - HC128 *enc = (HC128 *)XMALLOC(sizeof *enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); - HC128 *dec = (HC128 *)XMALLOC(sizeof *enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); - if ((! enc) || (! dec)) { - ERROR_OUT(-4500, out); - } -#endif - - a.input = "\x00\x00\x00\x00\x00\x00\x00\x00"; - a.output = "\x37\x86\x02\xB9\x8F\x32\xA7\x48"; - a.inLen = 8; - a.outLen = 8; - - b.input = "\x00\x00\x00\x00\x00\x00\x00\x00"; - b.output = "\x33\x7F\x86\x11\xC6\xED\x61\x5F"; - b.inLen = 8; - b.outLen = 8; - - c.input = "\x00\x00\x00\x00\x00\x00\x00\x00"; - c.output = "\x2E\x1E\xD1\x2A\x85\x51\xC0\x5A"; - c.inLen = 8; - c.outLen = 8; - - d.input = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; - d.output = "\x1C\xD8\xAE\xDD\xFE\x52\xE2\x17\xE8\x35\xD0\xB7\xE8\x4E\x29"; - d.inLen = 15; - d.outLen = 15; - - test_hc128[0] = a; - test_hc128[1] = b; - test_hc128[2] = c; - test_hc128[3] = d; - - for (i = 0; i < times; ++i) { - /* align keys/ivs in plain/cipher buffers */ - XMEMCPY(plain, keys[i], 16); - XMEMCPY(cipher, ivs[i], 16); - - wc_Hc128_SetKey(enc, plain, cipher); - wc_Hc128_SetKey(dec, plain, cipher); - - /* align input */ - XMEMCPY(plain, test_hc128[i].input, test_hc128[i].outLen); - if (wc_Hc128_Process(enc, cipher, plain, - (word32)test_hc128[i].outLen) != 0) { - ret = -4501; - goto out; - } - if (wc_Hc128_Process(dec, plain, cipher, - (word32)test_hc128[i].outLen) != 0) { - ret = -4502; - goto out; - } - - if (XMEMCMP(plain, test_hc128[i].input, test_hc128[i].outLen)) { - ret = -4503 - i; - goto out; - } - - if (XMEMCMP(cipher, test_hc128[i].output, test_hc128[i].outLen)) { - ret = -4513 - i; - goto out; - } - } - - out: - -#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) - if (enc) - XFREE(enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); - if (dec) - XFREE(dec, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); -#endif - - return ret; -#else - return 0; -#endif /* HAVE_HC128 */ -} - - #ifndef NO_RABBIT WOLFSSL_TEST_SUBROUTINE int rabbit_test(void) { diff --git a/wolfssl.vcproj b/wolfssl.vcproj index fd40a6b3a..bcc661e5b 100644 --- a/wolfssl.vcproj +++ b/wolfssl.vcproj @@ -263,10 +263,6 @@ RelativePath=".\wolfcrypt\src\hash.c" >     - - diff --git a/wolfssl.vcxproj b/wolfssl.vcxproj index a334dc0e0..6f5fccc09 100644 --- a/wolfssl.vcxproj +++ b/wolfssl.vcxproj @@ -311,7 +311,6 @@ - diff --git a/wolfssl/internal.h b/wolfssl/internal.h index d92fa2a46..2ee009069 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -33,9 +33,6 @@ #ifndef NO_DES3 #include #endif -#ifndef NO_HC128 - #include -#endif #ifndef NO_RABBIT #include #endif @@ -463,15 +460,6 @@ #endif #if defined(WOLFSSL_STATIC_RSA) - #if !defined(NO_HC128) && !defined(NO_RSA) && !defined(NO_TLS) - #ifndef NO_MD5 - #define BUILD_TLS_RSA_WITH_HC_128_MD5 - #endif - #if !defined(NO_SHA) - #define BUILD_TLS_RSA_WITH_HC_128_SHA - #endif - #endif - #if !defined(NO_RABBIT) && !defined(NO_TLS) && !defined(NO_RSA) #if !defined(NO_SHA) #define BUILD_TLS_RSA_WITH_RABBIT_SHA @@ -915,11 +903,6 @@ #define NO_CHAPOL_AEAD #endif -#if defined(BUILD_TLS_RSA_WITH_HC_128_SHA) || \ - defined(BUILD_TLS_RSA_WITH_HC_128_MD5) - #define BUILD_HC128 -#endif - #if defined(BUILD_TLS_RSA_WITH_RABBIT_SHA) #define BUILD_RABBIT #endif @@ -1022,8 +1005,6 @@ enum { TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 = 0x26, /* wolfSSL extension - eSTREAM */ - TLS_RSA_WITH_HC_128_MD5 = 0xFB, - TLS_RSA_WITH_HC_128_SHA = 0xFC, TLS_RSA_WITH_RABBIT_SHA = 0xFD, WDM_WITH_NULL_SHA256 = 0xFE, /* wolfSSL DTLS Multicast */ @@ -1438,9 +1419,6 @@ enum Misc { HMAC_NONCE_SZ = 12, /* Size of HMAC nonce */ - HC_128_KEY_SIZE = 16, /* 128 bits */ - HC_128_IV_SIZE = 16, /* also 128 bits */ - RABBIT_KEY_SIZE = 16, /* 128 bits */ RABBIT_IV_SIZE = 8, /* 64 bits for iv */ @@ -3259,9 +3237,6 @@ typedef struct Ciphers { #ifdef HAVE_CHACHA ChaCha* chacha; #endif -#ifdef HAVE_HC128 - HC128* hc128; -#endif #ifdef BUILD_RABBIT Rabbit* rabbit; #endif diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 79ca1a062..464f3b26f 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -2999,7 +2999,6 @@ enum BulkCipherAlgorithm { wolfssl_aes_ccm = 8, wolfssl_chacha = 9, wolfssl_camellia = 10, - wolfssl_hc128 = 11, wolfssl_rabbit = 12, #ifdef HAVE_IDEA wolfssl_idea = 13 diff --git a/wolfssl/wolfcrypt/hc128.h b/wolfssl/wolfcrypt/hc128.h deleted file mode 100644 index 910d18e74..000000000 --- a/wolfssl/wolfcrypt/hc128.h +++ /dev/null @@ -1,67 +0,0 @@ -/* hc128.h - * - * Copyright (C) 2006-2021 wolfSSL Inc. - * - * This file is part of wolfSSL. - * - * wolfSSL is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * wolfSSL is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA - */ - -/*! - \file wolfssl/wolfcrypt/hc128.h -*/ - - -#ifndef WOLF_CRYPT_HC128_H -#define WOLF_CRYPT_HC128_H - -#include - -#ifndef NO_HC128 - -#ifdef __cplusplus - extern "C" { -#endif - -enum { - HC128_ENC_TYPE = WC_CIPHER_HC128, /* cipher unique type */ -}; - -/* HC-128 stream cipher */ -typedef struct HC128 { - word32 T[1024]; /* P[i] = T[i]; Q[i] = T[1024 + i ]; */ - word32 X[16]; - word32 Y[16]; - word32 counter1024; /* counter1024 = i mod 1024 at the ith step */ - word32 key[8]; - word32 iv[8]; -#ifdef XSTREAM_ALIGN - void* heap; /* heap hint, currently XMALLOC only used with aligning */ -#endif -} HC128; - - -WOLFSSL_API int wc_Hc128_Process(HC128*, byte*, const byte*, word32); -WOLFSSL_API int wc_Hc128_SetKey(HC128*, const byte* key, const byte* iv); - -WOLFSSL_LOCAL int wc_Hc128_SetHeap(HC128* ctx, void* heap); - -#ifdef __cplusplus - } /* extern "C" */ -#endif - -#endif /* HAVE_HC128 */ -#endif /* WOLF_CRYPT_HC128_H */ - diff --git a/wolfssl/wolfcrypt/include.am b/wolfssl/wolfcrypt/include.am index 7728fc35c..28513c54e 100644 --- a/wolfssl/wolfcrypt/include.am +++ b/wolfssl/wolfcrypt/include.am @@ -29,7 +29,6 @@ nobase_include_HEADERS+= \ wolfssl/wolfcrypt/error-crypt.h \ wolfssl/wolfcrypt/fips_test.h \ wolfssl/wolfcrypt/hash.h \ - wolfssl/wolfcrypt/hc128.h \ wolfssl/wolfcrypt/hmac.h \ wolfssl/wolfcrypt/kdf.h \ wolfssl/wolfcrypt/integer.h \ diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index c68b17915..75721c49b 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -465,7 +465,6 @@ /* Allows use of DH with fixed points if uncommented and NO_DH is removed */ /* WOLFSSL_DH_CONST */ #define NO_DSA - #define NO_HC128 #define HAVE_ECC #define NO_SESSION_CACHE #define WOLFSSL_CMSIS_RTOS @@ -802,9 +801,6 @@ extern void uITRON4_free(void *p) ; #ifndef NO_DSA #define NO_DSA #endif - #ifndef NO_HC128 - #define NO_HC128 - #endif #ifndef SINGLE_THREADED #include "semphr.h" @@ -934,7 +930,6 @@ extern void uITRON4_free(void *p) ; /* Allows use of DH with fixed points if uncommented and NO_DH is removed */ /* WOLFSSL_DH_CONST */ #define NO_DSA - #define NO_HC128 #define NO_DEV_RANDOM #define NO_WOLFSSL_DIR #define NO_RABBIT @@ -2031,7 +2026,7 @@ extern void uITRON4_free(void *p) ; #if (defined(WOLFSSL_TLS13) && defined(WOLFSSL_NO_TLS12)) || \ (!defined(HAVE_AES_CBC) && defined(NO_DES3) && defined(NO_RC4) && \ !defined(HAVE_CAMELLIA) && !defined(HAVE_IDEA) && \ - !defined(HAVE_NULL_CIPHER) && !defined(HAVE_HC128)) + !defined(HAVE_NULL_CIPHER)) #define WOLFSSL_AEAD_ONLY #endif diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index 1c97fdce2..aa6650cc2 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -998,7 +998,6 @@ decouple library dependencies with standard string, memory and so on. WC_CIPHER_DES3 = 7, WC_CIPHER_DES = 8, WC_CIPHER_CHACHA = 9, - WC_CIPHER_HC128 = 10, WC_CIPHER_IDEA = 11, WC_CIPHER_MAX = WC_CIPHER_AES_CCM diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 062c1fbb9..a963ac67c 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -54,7 +54,6 @@ if(CONFIG_WOLFSSL) zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/wolfcrypt/src/ge_low_mem.c) zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/wolfcrypt/src/ge_operations.c) zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/wolfcrypt/src/hash.c) - zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/wolfcrypt/src/hc128.c) zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/wolfcrypt/src/hmac.c) zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/wolfcrypt/src/idea.c) zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/wolfcrypt/src/integer.c) diff --git a/zephyr/user_settings-tls-generic.h b/zephyr/user_settings-tls-generic.h index 071970e23..146866c91 100644 --- a/zephyr/user_settings-tls-generic.h +++ b/zephyr/user_settings-tls-generic.h @@ -69,9 +69,6 @@ extern "C" { #undef NO_RC4 #define NO_RC4 -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT diff --git a/zephyr/user_settings.h b/zephyr/user_settings.h index 006f13ed1..153c244b3 100644 --- a/zephyr/user_settings.h +++ b/zephyr/user_settings.h @@ -74,9 +74,6 @@ extern "C" { #undef NO_RC4 #define NO_RC4 -#undef NO_HC128 -#define NO_HC128 - #undef NO_RABBIT #define NO_RABBIT