From 535499cc5fecfe38ffd1ddabfacb4a98d0edf911 Mon Sep 17 00:00:00 2001 From: Carton Date: Wed, 12 Feb 2020 12:33:47 +0100 Subject: [PATCH] pkg/monocypher: bump to version 3.0.0 --- pkg/monocypher/Makefile | 2 +- pkg/monocypher/Makefile.dep | 3 ++- pkg/monocypher/Makefile.include | 5 +++-- .../0001-Monocypher-add-riot-makefiles.patch | Bin 806 -> 807 bytes 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/monocypher/Makefile b/pkg/monocypher/Makefile index fcd96b64c9..c0c354c90d 100644 --- a/pkg/monocypher/Makefile +++ b/pkg/monocypher/Makefile @@ -1,6 +1,6 @@ PKG_NAME=monocypher PKG_URL=https://github.com/LoupVaillant/Monocypher -PKG_VERSION=d9cc2aea29158971ed4b7dc074efdcb35e7183d5 +PKG_VERSION=ff334e288a667c5cd8500c04d1e2ebd601b9f215 PKG_LICENSE=CC-0 include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/monocypher/Makefile.dep b/pkg/monocypher/Makefile.dep index 2a90b71378..21096b0b43 100644 --- a/pkg/monocypher/Makefile.dep +++ b/pkg/monocypher/Makefile.dep @@ -1,4 +1,5 @@ -USEMODULE += monocypher_sha512 +# SHA-512 & ED25519 +USEMODULE += monocypher_optional # monocypher is only supported by 32 bit architectures FEATURES_REQUIRED += arch_32bit diff --git a/pkg/monocypher/Makefile.include b/pkg/monocypher/Makefile.include index a72d0d8d33..6309a213f7 100644 --- a/pkg/monocypher/Makefile.include +++ b/pkg/monocypher/Makefile.include @@ -1,7 +1,8 @@ INCLUDES += -I$(PKGDIRBASE)/monocypher/src INCLUDES += -I$(PKGDIRBASE)/monocypher/src/optional -ifneq (,$(filter monocypher_sha512,$(USEMODULE))) - CFLAGS += -DED25519_SHA512 +ifneq (,$(filter monocypher_optional,$(USEMODULE))) DIRS += $(PKGDIRBASE)/monocypher/src/optional endif + +CFLAGS += -DBLAKE2_NO_UNROLLING diff --git a/pkg/monocypher/patches/0001-Monocypher-add-riot-makefiles.patch b/pkg/monocypher/patches/0001-Monocypher-add-riot-makefiles.patch index cba5754d54d0eb463ce219b63d8ae7ba40925091..eacf2f9effdc36a09d8782f1389b2fb6dfd739c1 100644 GIT binary patch delta 24 fcmZ3+ww!IlJ0_0&f|AVqyu_Tzf=p_YrI@(^a#aWK delta 24 fcmZ3^wv27VJ0`Z`j6_pIqsf9yYLjJ{xf!_tWMKwq