From 93c6deb2d88ea0cd9520b0efb2390fc3c88fade9 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 3 Jun 2025 18:22:36 +0200 Subject: [PATCH] wolfcryptest: remove bbappend and FIPS patch The new version in meta-wolfssl does build properly, so this append is no longer needed. https://onedigi.atlassian.net/browse/DEL-9631 Signed-off-by: Javier Viguera --- .../wolfcrypt/wolfcrypttest.bbappend | 8 ----- ...fix-for-FIPS-enabled-wolfSSL-library.patch | 33 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest.bbappend delete mode 100644 meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest/0001-wolfcrypttest-fix-for-FIPS-enabled-wolfSSL-library.patch diff --git a/meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest.bbappend b/meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest.bbappend deleted file mode 100644 index b9bff6dfd..000000000 --- a/meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2022, Digi International Inc. - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI:append = " file://0001-wolfcrypttest-fix-for-FIPS-enabled-wolfSSL-library.patch" - -CFLAGS:append:arm = " -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8" -CFLAGS:append:aarch64 = " -DSIZEOF_LONG=8 -DSIZEOF_LONG_LONG=8" diff --git a/meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest/0001-wolfcrypttest-fix-for-FIPS-enabled-wolfSSL-library.patch b/meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest/0001-wolfcrypttest-fix-for-FIPS-enabled-wolfSSL-library.patch deleted file mode 100644 index 15a038045..000000000 --- a/meta-digi-arm/dynamic-layers/wolfssl/recipes-examples/wolfcrypt/wolfcrypttest/0001-wolfcrypttest-fix-for-FIPS-enabled-wolfSSL-library.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Javier Viguera -Date: Thu, 1 Sep 2022 18:58:13 +0200 -Subject: [PATCH] wolfcrypttest: fix for FIPS enabled wolfSSL library - -FIPS does not support MD5 - -Upstream-Status: Inappropriate [DEY specific] - -Signed-off-by: Javier Viguera ---- - test.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/test.c b/test.c -index 8ad937a8bacb..00d8ba0d2503 100644 ---- a/test.c -+++ b/test.c -@@ -18370,9 +18370,15 @@ WOLFSSL_TEST_SUBROUTINE int openssl_test(void) - c.inLen = XSTRLEN(c.input); - c.outLen = WC_MD5_DIGEST_SIZE; - -+#if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2) -+ /* Expect failure with MD5 + HMAC when using FIPS 140-3. */ -+ if (HMAC(EVP_md5(), "JefeJefeJefeJefe", 16, (byte*)c.input, (int)c.inLen, -+ hash, 0) != NULL) -+#else - if (HMAC(EVP_md5(), "JefeJefeJefeJefe", 16, (byte*)c.input, (int)c.inLen, - hash, 0) == NULL || - XMEMCMP(hash, c.output, WC_MD5_DIGEST_SIZE) != 0) -+#endif - { - return -8612; - }