pkg/monocypher: bump to version 3.0.0

2020-02-12 12:33:47 +01:00 · 2020-02-12 12:33:47 +01:00 · 535499cc5f
commit 535499cc5f
parent f5b6544123
4 changed files with 7 additions and 6 deletions
--- 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
--- 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
--- 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
--- a/pkg/monocypher/patches/0001-Monocypher-add-riot-makefiles.patch
+++ b/pkg/monocypher/patches/0001-Monocypher-add-riot-makefiles.patch
@ -25,9 +25,8 @@ index 0000000..784d588
 --- /dev/null
 +++ b/src/optional/Makefile
@@ -0,0 +1,3 @@
-+MODULE := monocypher_sha512
+MODULE := monocypher_optional
 +
 +include $(RIOTBASE)/Makefile.base
 -- 
 2.16.4
-