Merge pull request #46 from JacobBarthelmeh/release

recipes-examples/wolfcrypt/wolfcryptbenchmark/benchmark.h

@@ -1,6 +1,6 @@
 /* wolfcrypt/benchmark/benchmark.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -67,6 +67,14 @@ void bench_sha224(int useDeviceID);
 void bench_sha256(int useDeviceID);
 void bench_sha384(int useDeviceID);
 void bench_sha512(int useDeviceID);
+#if !defined(WOLFSSL_NOSHA512_224) && \
+   (!defined(HAVE_FIPS) || FIPS_VERSION_GE(5, 3)) && !defined(HAVE_SELFTEST)
+void bench_sha512_224(int useDeviceID);
+#endif
+#if !defined(WOLFSSL_NOSHA512_256) && \
+   (!defined(HAVE_FIPS) || FIPS_VERSION_GE(5, 3)) && !defined(HAVE_SELFTEST)
+void bench_sha512_256(int useDeviceID);
+#endif
 void bench_sha3_224(int useDeviceID);
 void bench_sha3_256(int useDeviceID);
 void bench_sha3_384(int useDeviceID);
@@ -114,10 +122,8 @@ void bench_blake2b(void);
 void bench_blake2s(void);
 void bench_pbkdf2(void);
 void bench_falconKeySign(byte level);
-void bench_dilithiumKeySign(byte level, byte sym);
+void bench_dilithiumKeySign(byte level);
 void bench_sphincsKeySign(byte level, byte optim);
-void bench_pqcKemKeygen(word32 alg);
-void bench_pqcKemEncapDecap(word32 alg);
 
 void bench_stats_print(void);
 

recipes-examples/wolfcrypt/wolfcryptbenchmark/wolfcryptbenchmark.bb

@@ -8,7 +8,7 @@ SECTION = "x11/applications"
 FILESEXTRAPATHS_prepend := "${THISDIR}:"
 
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://benchmark.c;beginline=1;endline=20;md5=0e91b118566c76b2fb4ff7757b8f21a2"
+LIC_FILES_CHKSUM = "file://benchmark.c;beginline=1;endline=20;md5=aca0c406899b7421c67598ba3f55d1a5"
 
 DEPENDS += "wolfssl"
 

recipes-examples/wolfcrypt/wolfcrypttest/test.h

@@ -1,6 +1,6 @@
 /* wolfcrypt/test/test.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -42,10 +42,54 @@ int wolfcrypt_test_main(int argc, char** argv);
 int wolf_test_task(void);
 #endif
 
+#ifndef WC_TEST_RET_HAVE_CUSTOM_MACROS
+
+#define WC_TEST_RET_TAG_NC     0
+#define WC_TEST_RET_TAG_EC     1
+#define WC_TEST_RET_TAG_ERRNO  2
+#define WC_TEST_RET_TAG_I      3
+
+#define WC_TEST_RET_ENC(line, i, tag)                           \
+        (-((line) + ((int)((unsigned)(i) & 0x7ff) * 100000) + ((tag) << 29)))
+
+#ifndef WC_TEST_RET_LN
+#define WC_TEST_RET_LN __LINE__
+#endif
+
+/* encode no code */
+#define WC_TEST_RET_ENC_NC WC_TEST_RET_ENC(WC_TEST_RET_LN, 0, WC_TEST_RET_TAG_NC)
+
+/* encode positive integer */
+#define WC_TEST_RET_ENC_I(i) WC_TEST_RET_ENC(WC_TEST_RET_LN, i, WC_TEST_RET_TAG_I)
+
+/* encode error code (negative integer) */
+#define WC_TEST_RET_ENC_EC(ec) WC_TEST_RET_ENC(WC_TEST_RET_LN, -(ec), WC_TEST_RET_TAG_EC)
+
+/* encode system/libc error code */
+#if defined(HAVE_ERRNO_H) && !defined(NO_FILESYSTEM) && \
+    !defined(NO_STDIO_FILESYSTEM) && !defined(WOLFSSL_USER_IO)
+#include <errno.h>
+#define WC_TEST_RET_ENC_ERRNO WC_TEST_RET_ENC(WC_TEST_RET_LN, errno, WC_TEST_RET_TAG_ERRNO)
+#else
+#define WC_TEST_RET_ENC_ERRNO WC_TEST_RET_ENC_NC
+#endif
+
+#define WC_TEST_RET_DEC_TAG(x) ((-(x)) >> 29)
+
+/* decode line number */
+#define WC_TEST_RET_DEC_LN(x) (((-(x)) & ~(3 << 29)) % 100000)
+
+/* decode integer or errno */
+#define WC_TEST_RET_DEC_I(x) (((-(x)) & ~(3 << 29)) / 100000)
+
+/* decode error code */
+#define WC_TEST_RET_DEC_EC(x) (-WC_TEST_RET_DEC_I(x))
+
+#endif /* !WC_TEST_RET_HAVE_CUSTOM_MACROS */
+
 #ifdef __cplusplus
     }  /* extern "C" */
 #endif
 
 
 #endif /* WOLFCRYPT_TEST_H */
-

recipes-examples/wolfcrypt/wolfcrypttest/wolfcrypttest.bb

@@ -8,7 +8,7 @@ SECTION = "x11/applications"
 FILESEXTRAPATHS_prepend := "${THISDIR}:"
 
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://test.c;beginline=1;endline=20;md5=bd722cec0f7e815c9c724017872b3b73"
+LIC_FILES_CHKSUM = "file://test.c;beginline=1;endline=20;md5=61d63fb8b820bae4d85beb53e7acf340"
 
 DEPENDS += "wolfssl"
 

recipes-wolfssl/wolfmqtt/files/0001-fix-have-wolfssl-m4-rule.patch

@@ -1,13 +0,0 @@
-Index: wolfmqtt-1.1.0/m4/have_wolfssl.m4
-===================================================================
---- wolfmqtt-1.1.0.orig/m4/have_wolfssl.m4
-+++ wolfmqtt-1.1.0/m4/have_wolfssl.m4
-@@ -7,7 +7,7 @@
- AC_DEFUN([_TAO_SEARCH_LIBWOLFSSL],[
-   AC_REQUIRE([AC_LIB_PREFIX])
- 
--  LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+  LDFLAGS="$LDFLAGS"
-   LIBS="$LIBS -lwolfssl"
- 
-   AC_LIB_HAVE_LINKFLAGS(wolfssl,,

recipes-wolfssl/wolfmqtt/wolfmqtt_1.15.1.bb

@@ -12,13 +12,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2"
 
 DEPENDS += "wolfssl"
 
-SRC_URI = "git://github.com/wolfssl/wolfMQTT.git;protocol=https;tag=v${PV} \
-           file://0001-fix-have-wolfssl-m4-rule.patch"
+SRC_URI = "git://github.com/wolfssl/wolfMQTT.git;protocol=https;tag=v${PV}"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF = "--with-libwolfssl-prefix=${COMPONENTS_DIR}/${PACKAGE_ARCH}/wolfssl/usr"
 do_configure_prepend() {
     (cd ${S}; ./autogen.sh; cd -)
 }

recipes-wolfssl/wolfssl/files/6247.patch

@@ -0,0 +1,38 @@
+From e1730c760c79b7d5ebc7613555ab8e221e7ac521 Mon Sep 17 00:00:00 2001
+From: JacobBarthelmeh <jacob@wolfssl.com>
+Date: Wed, 29 Mar 2023 14:11:56 -0700
+Subject: [PATCH] check if colrm is available for options.h creation
+
+---
+ configure.ac | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 38afb1f1a0a..81f75b970f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8641,8 +8641,23 @@ echo "extern \"C\" {" >> $OPTION_FILE
+ echo "#endif" >> $OPTION_FILE
+ echo "" >> $OPTION_FILE
+ 
++# check for supported command to trim option with
++which colrm &> /dev/null
++RESULT=$?
++if test "$RESULT" = "0"; then
++    TRIM="colrm 3"
++else
++    which cut &> /dev/null
++    RESULT=$?
++    if test "$RESULT" = "0"; then
++        TRIM="cut -c1-2"
++    else
++        AC_MSG_ERROR([Could not find colrm or cut to make options file])
++    fi
++fi
++
+ for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do
+-    opt_type=$(echo $option | colrm 3)
++    opt_type=$(echo $option | $TRIM )
+     case "$opt_type" in
+     -D)
+         RHS_only=$(echo $option | sed 's/^-D//')

recipes-wolfssl/wolfssl/wolfssl_5.6.0.bb

@@ -15,6 +15,7 @@ PROVIDES += "wolfssl"
 RPROVIDES_${PN} = "wolfssl"
 
 SRC_URI = "git://github.com/wolfssl/wolfssl.git;nobranch=1;protocol=https;tag=v${PV}-stable;"
+SRC_URI += "file://6247.patch"
 
 S = "${WORKDIR}/git"