From b6298d1ffed6ac26cdcce051fb72372589489732 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 16 Nov 2020 14:17:57 +0100 Subject: [PATCH 1/2] pkg/hacl: blacklist package The upstream hacl repo has been removed. The new version can be found at [0], but requires some work on the pkg. As a quick fix, make the pkg depend on a non-existing feature to prevent build on CI. [0] https://github.com/project-everest/hacl-star/tree/master/dist/ --- pkg/hacl/Makefile.dep | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/hacl/Makefile.dep b/pkg/hacl/Makefile.dep index f9aabaca2e9e..03d46ab9938f 100644 --- a/pkg/hacl/Makefile.dep +++ b/pkg/hacl/Makefile.dep @@ -2,3 +2,6 @@ USEMODULE+=random # HACL is only supported by 32 bit architectures FEATURES_REQUIRED += arch_32bit + +# upstream has moved and repo structure changed +FEATURES_REQUIRED += working_upstream From b2d0301ec6ded92142e709f6d2ea87340e942d78 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 16 Nov 2020 14:35:24 +0100 Subject: [PATCH 2/2] tests/pkg_libcose: use libcose_crypt_c25519 The hacl package is currently broken, switch to c25519. --- tests/pkg_libcose/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pkg_libcose/Makefile b/tests/pkg_libcose/Makefile index 8206fe43b0fb..3718cb113e5c 100644 --- a/tests/pkg_libcose/Makefile +++ b/tests/pkg_libcose/Makefile @@ -5,8 +5,8 @@ TEST_ON_CI_WHITELIST += native USEPKG += libcose # By default we use hacl as crypto backend, uncomment to use a different # crypto backend. -USEMODULE += libcose_crypt_hacl -# USEMODULE += libcose_crypt_c25519 +# USEMODULE += libcose_crypt_hacl +USEMODULE += libcose_crypt_c25519 USEMODULE += memarray USEMODULE += embunit