Merge pull request #71 from night1rider/dunfell-update

Updating Yocto recipes and removing files

recipes-examples/wolfcrypt/wolfcryptbenchmark/benchmark.h

@@ -1,145 +0,0 @@
-/* wolfcrypt/benchmark/benchmark.h
- *
- * Copyright (C) 2006-2023 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#ifndef WOLFCRYPT_BENCHMARK_H
-#define WOLFCRYPT_BENCHMARK_H
-
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-#include <wolfssl/wolfcrypt/types.h> /* Needed for 'byte' typedef */
-
-/* run all benchmark entry */
-#ifdef HAVE_STACK_SIZE
-THREAD_RETURN WOLFSSL_THREAD benchmark_test(void* args);
-#else
-int benchmark_test(void *args);
-#endif
-#ifndef NO_MAIN_DRIVER
-int wolfcrypt_benchmark_main(int argc, char** argv);
-#endif
-
-/* individual benchmarks */
-int  benchmark_init(void);
-int  benchmark_free(void);
-void benchmark_configure(word32 block_size);
-
-void bench_des(int useDeviceID);
-void bench_arc4(int useDeviceID);
-void bench_chacha(void);
-void bench_chacha20_poly1305_aead(void);
-void bench_aescbc(int useDeviceID);
-void bench_aesgcm(int useDeviceID);
-void bench_gmac(int useDeviceID);
-void bench_aesccm(int useDeviceID);
-void bench_aesecb(int useDeviceID);
-void bench_aesxts(void);
-void bench_aesctr(int useDeviceID);
-void bench_aescfb(void);
-void bench_aesofb(void);
-void bench_aessiv(void);
-void bench_poly1305(void);
-void bench_camellia(void);
-void bench_sm4_cbc(void);
-void bench_sm4_gcm(void);
-void bench_sm4_ccm(void);
-void bench_md5(int useDeviceID);
-void bench_sha(int useDeviceID);
-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);
-void bench_sha3_512(int useDeviceID);
-void bench_shake128(int useDeviceID);
-void bench_shake256(int useDeviceID);
-void bench_sm3(int useDeviceID);
-void bench_ripemd(void);
-void bench_cmac(int useDeviceID);
-void bench_scrypt(void);
-void bench_hmac_md5(int useDeviceID);
-void bench_hmac_sha(int useDeviceID);
-void bench_hmac_sha224(int useDeviceID);
-void bench_hmac_sha256(int useDeviceID);
-void bench_hmac_sha384(int useDeviceID);
-void bench_hmac_sha512(int useDeviceID);
-void bench_siphash(void);
-void bench_srtpkdf(void);
-void bench_rsaKeyGen(int useDeviceID);
-void bench_rsaKeyGen_size(int useDeviceID, word32 keySz);
-void bench_rsa(int useDeviceID);
-void bench_rsa_key(int useDeviceID, word32 keySz);
-void bench_dh(int useDeviceID);
-void bench_kyber(int type);
-void bench_lms(void);
-void bench_xmss(void);
-void bench_ecc_curve(int curveId);
-void bench_eccMakeKey(int useDeviceID, int curveId);
-void bench_ecc(int useDeviceID, int curveId);
-void bench_eccEncrypt(int curveId);
-void bench_sm2(int useDeviceID);
-void bench_curve25519KeyGen(int useDeviceID);
-void bench_curve25519KeyAgree(int useDeviceID);
-void bench_ed25519KeyGen(void);
-void bench_ed25519KeySign(void);
-void bench_curve448KeyGen(void);
-void bench_curve448KeyAgree(void);
-void bench_ed448KeyGen(void);
-void bench_ed448KeySign(void);
-void bench_eccsiKeyGen(void);
-void bench_eccsiPairGen(void);
-void bench_eccsiValidate(void);
-void bench_eccsi(void);
-void bench_sakkeKeyGen(void);
-void bench_sakkeRskGen(void);
-void bench_sakkeValidate(void);
-void bench_sakke(void);
-void bench_rng(void);
-void bench_blake2b(void);
-void bench_blake2s(void);
-void bench_pbkdf2(void);
-void bench_falconKeySign(byte level);
-void bench_dilithiumKeySign(byte level);
-void bench_sphincsKeySign(byte level, byte optim);
-
-void bench_stats_print(void);
-
-
-#ifdef __cplusplus
-    }  /* extern "C" */
-#endif
-
-
-#endif /* WOLFCRYPT_BENCHMARK_H */
-

recipes-examples/wolfcrypt/wolfcryptbenchmark/wolfcryptbenchmark.bb

@@ -11,13 +11,13 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://benchmark.c;beginline=1;endline=20;md5=aca0c406899b7421c67598ba3f55d1a5"
 
 DEPENDS += "wolfssl"
+WOLFCRYPT_V="5.6.6"
+SRC_URI = "git://github.com/wolfssl/wolfssl.git;nobranch=1;protocol=https;tag=v${WOLFCRYPT_V}-stable;"
 
-SRC_URI = "file://benchmark.c file://benchmark.h"
-
-S = "${WORKDIR}"
+S = "${WORKDIR}/git/wolfcrypt/benchmark"
 
 do_compile() {
-    ${CC} ${CFLAGS} -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DUSE_FLAT_BENCHMARK_H -DBENCH_EMBEDDED -Wall -include wolfssl/options.h -o wolfcryptbenchmark ${WORKDIR}/benchmark.c -lwolfssl ${LDFLAGS}
+    ${CC} ${CFLAGS} -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DUSE_FLAT_BENCHMARK_H -DBENCH_EMBEDDED -Wall -include wolfssl/options.h -o wolfcryptbenchmark ${S}/benchmark.c -lwolfssl ${LDFLAGS}
 }
 
 do_install() {

recipes-examples/wolfcrypt/wolfcrypttest/test.h

@@ -1,104 +0,0 @@
-/* wolfcrypt/test/test.h
- *
- * Copyright (C) 2006-2023 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#ifndef WOLFCRYPT_TEST_H
-#define WOLFCRYPT_TEST_H
-
-#include <wolfssl/wolfcrypt/types.h>
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-#ifdef WC_TEST_RET_CUSTOM_TYPE
-    typedef WC_TEST_RET_CUSTOM_TYPE wc_test_ret_t;
-#else
-    typedef sword32 wc_test_ret_t;
-#endif
-
-#include <wolfssl/wolfcrypt/settings.h>
-
-#ifdef HAVE_STACK_SIZE
-THREAD_RETURN WOLFSSL_THREAD wolfcrypt_test(void* args);
-#else
-wc_test_ret_t wolfcrypt_test(void* args);
-#endif
-
-#ifndef NO_MAIN_DRIVER
-wc_test_ret_t wolfcrypt_test_main(int argc, char** argv);
-#endif
-
-#if defined(WOLFSSL_ESPIDF) || defined(_WIN32_WCE)
-int wolf_test_task(void);
-#endif
-
-#ifndef WC_TEST_RET_HAVE_CUSTOM_MACROS
-
-#define WC_TEST_RET_TAG_NC     0L
-#define WC_TEST_RET_TAG_EC     1L
-#define WC_TEST_RET_TAG_ERRNO  2L
-#define WC_TEST_RET_TAG_I      3L
-
-#define WC_TEST_RET_ENC(line, i, tag)                           \
-        ((wc_test_ret_t)(-((wc_test_ret_t)(line) + ((wc_test_ret_t)((word32)(i) & 0x7ffL) * 100000L) + ((wc_test_ret_t)(tag) << 29L))))
-
-#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)) >> 29L)
-
-/* decode line number */
-#define WC_TEST_RET_DEC_LN(x) ((int)(((-(x)) & ~(3L << 29L)) % 100000L))
-
-/* decode integer or errno */
-#define WC_TEST_RET_DEC_I(x) ((int)((((-(x)) & ~(3L << 29L)) / 100000L)))
-
-/* decode error code */
-#define WC_TEST_RET_DEC_EC(x) ((int)(-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

@@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "file://test.c;beginline=1;endline=20;md5=61d63fb8b820bae4d85
 
 DEPENDS += "wolfssl"
 
-SRC_URI = "file://test.c file://test.h"
-
-S = "${WORKDIR}"
+WOLFCRYPT_V="5.6.6"
+SRC_URI = "git://github.com/wolfssl/wolfssl.git;nobranch=1;protocol=https;tag=v${WOLFCRYPT_V}-stable;"
+S = "${WORKDIR}/git/wolfcrypt/test"
 
 do_compile() {
-    ${CC} ${CFLAGS} -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DUSE_FLAT_TEST_H -Wall -include wolfssl/options.h -o wolfcrypttest ${WORKDIR}/test.c -lwolfssl ${LDFLAGS}
+    ${CC} ${CFLAGS} -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DUSE_FLAT_TEST_H -Wall -include wolfssl/options.h -o wolfcrypttest ${S}/test.c -lwolfssl ${LDFLAGS}
 }
 
 do_install() {

recipes-wolfssl/wolftpm/files/v2.7.0+pr277.diff

@@ -1,19 +0,0 @@
-diff --git a/wolftpm/tpm2_types.h b/wolftpm/tpm2_types.h
-index 6edbdee..745b17c 100644
---- a/wolftpm/tpm2_types.h
-+++ b/wolftpm/tpm2_types.h
-@@ -197,6 +197,14 @@ typedef int64_t  INT64;
-     #define XATOI(s)          atoi((s))
- #endif
- 
-+/* make sure file IO macros are available for examples */
-+#ifndef XFEOF /* used in pcr/extend example */
-+    #define XFEOF      feof
-+#endif
-+#ifndef XREWIND /* used in tpm_test_keys.c */
-+    #define XREWIND    rewind
-+#endif
-+
- /* enable way for customer to override printf */
- #ifdef XPRINTF
-     #undef  printf

recipes-wolfssl/wolftpm/wolftpm_3.1.0.bb

@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS += "wolfssl"
 
 SRC_URI = "git://github.com/wolfssl/wolfTPM.git;protocol=https;tag=v${PV}"
-SRC_URI += "file://v2.7.0+pr277.diff"
 
 S = "${WORKDIR}/git"
 

update-version.sh

@@ -28,9 +28,16 @@ get_new() {
 }
 
 update() {
-    if [ "CURRENT" != "NEW" ]; then
+    if [ "$CURRENT" != "$NEW" ]; then
         printf "updating from $CURRENT to $NEW\n"
         git mv ./recipes-wolfssl/$1/$1_$CURRENT.bb ./recipes-wolfssl/$1/$1_$NEW.bb &> /dev/null
+        if [ "$1" = "wolfssl" ]; then
+            printf "\tUpdating wolfcrypt test and benchmark...\n"
+            sed -i "s/WOLFCRYPT_V=.*/WOLFCRYPT_V=\"$NEW\"/" ./recipes-examples/wolfcrypt/wolfcrypttest/wolfcrypttest.bb
+            git add ./recipes-examples/wolfcrypt/wolfcrypttest/wolfcrypttest.bb &> /dev/null
+            sed -i  "s/WOLFCRYPT_V=.*/WOLFCRYPT_V=\"$NEW\"/" ./recipes-examples/wolfcrypt/wolfcryptbenchmark/wolfcryptbenchmark.bb
+            git add ./recipes-examples/wolfcrypt/wolfcryptbenchmark/wolfcryptbenchmark.bb &> /dev/null
+        fi 
     else
         printf "version $CURRENT is the latest\n"
     fi
@@ -42,20 +49,6 @@ get_current "wolfssl"
 get_new "wolfssl"
 update "wolfssl"
 
-# update benchmark and testwolfcrypt if needed
-if [ "CURRENT" != "NEW" ]; then
-    set -e
-    printf "Updating wolfSSL benchmark and test files..."
-    curl -L -o wolfssl-$NEW.zip https://api.github.com/repos/wolfSSL/wolfssl/zipball/v$NEW-stable &> /dev/null
-    unzip wolfssl-$NEW.zip &> /dev/null
-    mv wolfSSL-wolfssl-* wolfssl-$NEW &> /dev/null
-    cp ./wolfssl-$NEW/wolfcrypt/benchmark/benchmark.{c,h} recipes-examples/wolfcrypt/wolfcryptbenchmark/ &> /dev/null
-    cp ./wolfssl-$NEW/wolfcrypt/test/test.{c,h} recipes-examples/wolfcrypt/wolfcrypttest/ &> /dev/null
-    rm -rf ./wolfssl-$NEW* &> /dev/null
-    printf "done\n"
-    set +e
-fi
-
 printf "Checking version of wolfMQTT to use..."
 get_current "wolfmqtt"
 get_new "wolfmqtt"