diff --git a/pkg/wolfssl/Makefile b/pkg/wolfssl/Makefile index 41713432ef..8382bccb7b 100644 --- a/pkg/wolfssl/Makefile +++ b/pkg/wolfssl/Makefile @@ -1,7 +1,7 @@ PKG_NAME=wolfssl PKG_URL=https://github.com/wolfssl/wolfssl.git -# v4.5.0 -PKG_VERSION=0fa5af9929ce2ee99e8789996a3048f41a99830e +# v5.5.4 +PKG_VERSION=4fbd4fd36a21efd9d1a7e17aba390e91c78693b1 PKG_LICENSE=GPLv2 include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/wolfssl/Makefile.wolfcrypt b/pkg/wolfssl/Makefile.wolfcrypt index 51a624e94c..dc84c88e44 100644 --- a/pkg/wolfssl/Makefile.wolfcrypt +++ b/pkg/wolfssl/Makefile.wolfcrypt @@ -18,6 +18,7 @@ NO_AUTO_SRC = 1 # Default CRYPTO source files # #-------------------------------------------------------------# SRC += error.c \ + kdf.c \ hash.c \ logging.c \ wc_encrypt.c \ diff --git a/pkg/wolfssl/include/user_settings.h b/pkg/wolfssl/include/user_settings.h index c14f5adb75..79f58f2aca 100644 --- a/pkg/wolfssl/include/user_settings.h +++ b/pkg/wolfssl/include/user_settings.h @@ -21,10 +21,8 @@ extern "C" { #define NO_MAIN_DRIVER #define NO_SIG_WRAPPER #define NO_OLD_RNGNAME - -/* Uncomment the next two lines to enable wolfSSL debug */ -// #define DEBUG_WOLFSSL -// #define WOLFSSL_LOG_PRINTF +#define HAVE_STRINGS_H +#define WOLFSSL_IPV6 /* Single precision math */ #define WOLFSSL_SP_MATH @@ -98,6 +96,12 @@ int strncasecmp(const char *s1, const char * s2, unsigned int sz); #define WOLFSSL_DTLS #endif +#undef WOLFSSL_DTLS13 +#ifdef MODULE_WOLFSSL_DTLS13 +#define WOLFSSL_DTLS13 +#define HAVE_AEAD +#endif + #undef HAVE_FFDHE_2048 #ifdef MODULE_WOLFCRYPT_FFDHE_2048 #define HAVE_FFDHE_2048 @@ -303,6 +307,23 @@ int strncasecmp(const char *s1, const char * s2, unsigned int sz); #define HAVE_TLS13 #define WOLFSSL_TLS13 #define BUILD_TLS_AES_128_GCM_SHA256 +#define NO_OLD_TLS +#define HAVE_TLS_EXTENSIONS +#define HAVE_AES_DECRYPT +#define HAVE_AESGCM +#define GCM_SMALL +#define HAVE_AESCCM +#define WOLFSSL_AES_COUNTER +#define WOLFSSL_AES_DIRECT +#define HAVE_FFDHE_4096 +#define HAVE_HKDF +#define WC_RSA_PSS +#define WOLFSSL_SEND_HRR_COOKIE +#endif + +#ifdef MODULE_WOLFSSL_DEBUG +#define DEBUG_WOLFSSL +#define WOLFSSL_LOG_PRINTF #endif #ifdef __cplusplus diff --git a/pkg/wolfssl/patches/0001-Fix-missing-include-necessary-to-use-gettimeofday-on.patch b/pkg/wolfssl/patches/0001-Fix-missing-include-necessary-to-use-gettimeofday-on.patch new file mode 100644 index 0000000000..0e91f51c99 Binary files /dev/null and b/pkg/wolfssl/patches/0001-Fix-missing-include-necessary-to-use-gettimeofday-on.patch differ diff --git a/pkg/wolfssl/patches/0001-wolfssl-wolfcrypt-fix-signature-mismatch-to-compile-.patch b/pkg/wolfssl/patches/0001-wolfssl-wolfcrypt-fix-signature-mismatch-to-compile-.patch deleted file mode 100644 index 150eb4d932..0000000000 Binary files a/pkg/wolfssl/patches/0001-wolfssl-wolfcrypt-fix-signature-mismatch-to-compile-.patch and /dev/null differ