Merge #19302

19302: pkg/wolfssl: Update wolfSSL to 5.5.4 and add DTLS 1.3 support r=benpicco a=Flole998



Co-authored-by: Florian Lentz <flolen@uni-bremen.de>
Co-authored-by: Flole998 <Flole998@users.noreply.github.com>

examples/dtls-wolfssl/Makefile.ci

@@ -1,16 +1,18 @@
 BOARD_INSUFFICIENT_MEMORY := \
     airfy-beacon \
-    b-l072z-lrwan1 \
     blackpill-stm32f103c8 \
-    bluepill-stm32f103c8 \
+    blackpill-stm32f103cb \
     bluepill-stm32f030c8 \
+    bluepill-stm32f103c8 \
+    bluepill-stm32f103cb \
     calliope-mini \
     cc2650-launchpad \
     cc2650stk \
     hifive1 \
+    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
-    maple-mini \
+    lobaro-lorabox \
     microbit \
     nrf51dongle \
     nrf6310 \
@@ -23,10 +25,15 @@ BOARD_INSUFFICIENT_MEMORY := \
     nucleo-f302r8 \
     nucleo-f303k8 \
     nucleo-f334r8 \
+    nucleo-f410rb \
+    nucleo-g070rb \
+    nucleo-g071rb \
+    nucleo-g431rb \
     nucleo-l011k4 \
     nucleo-l031k6 \
     nucleo-l053r8 \
-    nucleo-l073rz \
+    nucleo-l412kb \
+    olimexino-stm32 \
     opencm904 \
     samd10-xmini \
     saml10-xpro \
@@ -41,7 +48,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     stm32f7508-dk \
     stm32g0316-disco \
     stm32l0538-disco \
-    stm32mindev \
     stm32mp157c-dk2 \
     yunjia-nrf51822 \
     #

pkg/wolfssl/Makefile

@@ -1,7 +1,7 @@
 PKG_NAME=wolfssl
 PKG_URL=https://github.com/wolfssl/wolfssl.git
-# v4.5.0
+# v5.5.4
-PKG_VERSION=0fa5af9929ce2ee99e8789996a3048f41a99830e
+PKG_VERSION=4fbd4fd36a21efd9d1a7e17aba390e91c78693b1
 PKG_LICENSE=GPLv2
 
 include $(RIOTBASE)/pkg/pkg.mk

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 \

pkg/wolfssl/include/user_settings.h

@@ -21,10 +21,8 @@ extern "C" {
 #define NO_MAIN_DRIVER
 #define NO_SIG_WRAPPER
 #define NO_OLD_RNGNAME
-
+#define HAVE_STRINGS_H
-/* Uncomment the next two lines to enable wolfSSL debug */
+#define WOLFSSL_IPV6
-// #define DEBUG_WOLFSSL
-// #define WOLFSSL_LOG_PRINTF
 
 /* 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

tests/pkg_wolfcrypt-ed25519-verify/Makefile

@@ -8,5 +8,6 @@ CFLAGS+=-DNO_ED25519_SIGN -DNO_ED25519_KEY_EXPORT
 USEPKG +=wolfssl
 USEMODULE += wolfcrypt
 USEMODULE += wolfcrypt_ed25519
+USEMODULE += wolfcrypt_random
 
 include $(RIOTBASE)/Makefile.include

tests/pkg_wolfssl/Makefile.ci

@@ -1,17 +1,24 @@
 BOARD_INSUFFICIENT_MEMORY := \
     blackpill-stm32f103c8 \
-    bluepill-stm32f103c8 \
+    blackpill-stm32f103cb \
     bluepill-stm32f030c8 \
+    bluepill-stm32f103c8 \
+    bluepill-stm32f103cb \
     i-nucleo-lrwan1 \
     nucleo-f030r8 \
     nucleo-f031k6 \
     nucleo-f042k6 \
+    nucleo-f070rb \
+    nucleo-f072rb \
     nucleo-f302r8 \
     nucleo-f303k8 \
     nucleo-f334r8 \
+    nucleo-g070rb \
+    nucleo-g071rb \
     nucleo-l011k4 \
     nucleo-l031k6 \
     nucleo-l053r8 \
+    opencm904 \
     samd10-xmini \
     saml10-xpro \
     saml11-xpro \

tests/pkg_wolfssl/tests/01-run.py

@@ -15,7 +15,7 @@ BOARD = os.environ.get("BOARD", "native")
 TEST_TIMEOUT = 600 if BOARD != 'native' else DEFAULT_TIMEOUT
 # ECDSA 256 takes +30s on samr21-xpro
 # ECDSA 256 takes +40s on nrf51dk
-BENCH_TIMEOUT = 40 if BOARD != 'native' else DEFAULT_TIMEOUT
+BENCH_TIMEOUT = 40 if BOARD != 'native' else 20
 
 
 def _wait_for_test(child):