From bf703a70c3bcd46d0c676aee03f9cba165f6be3b Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Tue, 24 Mar 2020 14:19:14 +0100 Subject: [PATCH 1/2] tests/pkg_libcose: remove the monocypher crypto option --- tests/pkg_libcose/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/pkg_libcose/Makefile b/tests/pkg_libcose/Makefile index 1d73e82e49..8206fe43b0 100644 --- a/tests/pkg_libcose/Makefile +++ b/tests/pkg_libcose/Makefile @@ -7,7 +7,6 @@ USEPKG += libcose # crypto backend. USEMODULE += libcose_crypt_hacl # USEMODULE += libcose_crypt_c25519 -# USEMODULE += libcose_crypt_monocypher USEMODULE += memarray USEMODULE += embunit From 95fa4bae5aeb721dfe59a5de3d78a47a4158ff60 Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Tue, 24 Mar 2020 14:19:56 +0100 Subject: [PATCH 2/2] pkg/libcose: remove Monocypher as crypto backend With the 3.0.0 update of monocypher the API changed enough to break libcose compatibility. This PR removes monocypher from the crypto options. It can be restored as soon as upstream libcose is updated to restore compatibility --- pkg/libcose/Makefile.dep | 3 --- pkg/libcose/Makefile.include | 3 --- 2 files changed, 6 deletions(-) diff --git a/pkg/libcose/Makefile.dep b/pkg/libcose/Makefile.dep index f62a5eb7f2..2d5f718216 100644 --- a/pkg/libcose/Makefile.dep +++ b/pkg/libcose/Makefile.dep @@ -7,9 +7,6 @@ USEMODULE += random ifneq (,$(filter libcose_crypt_hacl,$(USEMODULE))) USEPKG += hacl endif -ifneq (,$(filter libcose_crypt_monocypher,$(USEMODULE))) - USEPKG += monocypher -endif ifneq (,$(filter libcose_crypt_c25519,$(USEMODULE))) USEPKG += c25519 endif diff --git a/pkg/libcose/Makefile.include b/pkg/libcose/Makefile.include index d2b027bfe6..92328dc9b3 100644 --- a/pkg/libcose/Makefile.include +++ b/pkg/libcose/Makefile.include @@ -4,9 +4,6 @@ CFLAGS += -DUSE_CBOR_CONTEXT ifneq (,$(filter libcose_crypt_hacl,$(USEMODULE))) CFLAGS += -DCRYPTO_HACL endif -ifneq (,$(filter libcose_crypt_monocypher,$(USEMODULE))) - CFLAGS += -DCRYPTO_MONOCYPHER -endif ifneq (,$(filter libcose_crypt_c25519,$(USEMODULE))) CFLAGS += -DCRYPTO_C25519 endif