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 <javier.viguera@digi.com>
This commit is contained in:
parent
fcd03fb421
commit
93c6deb2d8
|
|
@ -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"
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From: Javier Viguera <javier.viguera@digi.com>
|
||||
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 <javier.viguera@digi.com>
|
||||
---
|
||||
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;
|
||||
}
|
||||
Loading…
Reference in New Issue