riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16464 from chrysn-pull-requests/libcose-update

Browse Source 
pkg/libcose: Update to latest master
This commit is contained in:
Koen Zandberg 2021-05-12 09:38:06 +02:00 committed by GitHub
commit 4560fefca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/libcose/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME=libcose PKG_NAME=libcose
PKG_URL=https://github.com/bergzand/libcose PKG_URL=https://github.com/bergzand/libcose
PKG_VERSION=8b5f651c3203682a2d98121cd3e5c844cb2b4c36 PKG_VERSION=3fdf1238987b6aeec113b1872e56307893feeae7
PKG_LICENSE=LGPL PKG_LICENSE=LGPL
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

3
pkg/libcose/Makefile.dep
View File

@ -10,3 +10,6 @@ endif
ifneq (,$(filter libcose_crypt_c25519,$(USEMODULE))) ifneq (,$(filter libcose_crypt_c25519,$(USEMODULE)))
USEPKG += c25519 USEPKG += c25519
endif endif
ifneq (,$(filter libcose_crypt_tinycrypt,$(USEMODULE)))
USEPKG += tinycrypt
endif

3
pkg/libcose/Makefile.include
View File

@ -7,6 +7,9 @@ endif
ifneq (,$(filter libcose_crypt_c25519,$(USEMODULE))) ifneq (,$(filter libcose_crypt_c25519,$(USEMODULE)))
CFLAGS += -DCRYPTO_C25519 CFLAGS += -DCRYPTO_C25519
endif endif
ifneq (,$(filter libcose_crypt_tinycrypt,$(USEMODULE)))
CFLAGS += -DCRYPTO_TINYCRYPT
endif
# Declare pseudomodules here to be selfcontained # Declare pseudomodules here to be selfcontained
PSEUDOMODULES += libcose_crypt_% PSEUDOMODULES += libcose_crypt_%

15
pkg/libcose/patches/0001-RIOT-Use-RIOT-random_bytes-function-instead-of-rando.patch
View File

@ -67,20 +67,19 @@ index c24d751..3bdcabf 100644
} }
#endif /* CRYPTO_HACL_INCLUDE_CHACHAPOLY */ #endif /* CRYPTO_HACL_INCLUDE_CHACHAPOLY */
diff --git a/src/crypt/monocypher.c b/src/crypt/monocypher.c diff --git a/src/crypt/monocypher.c b/src/crypt/monocypher.c
index 9e4dcbc..d1fcac1 100644 index f3186f7..fd27839 100644
--- a/src/crypt/monocypher.c --- a/src/crypt/monocypher.c
+++ b/src/crypt/monocypher.c +++ b/src/crypt/monocypher.c
@@ -17,8 +17,7 @@ @@ -19,7 +19,7 @@
#include <monocypher.h>
#include "cose/crypto.h" #include "cose/crypto.h"
#include "cose/crypto/selectors.h" #include "cose/crypto/selectors.h"
-
-extern void randombytes(uint8_t *target, uint64_t n); -extern void randombytes(uint8_t *target, uint64_t n);
+#include "random.h" +#include "random.h"
static const uint8_t zero[32] = { 0 };
#ifdef CRYPTO_MONOCYPHER_INCLUDE_CHACHAPOLY #ifdef CRYPTO_MONOCYPHER_INCLUDE_CHACHAPOLY
static uint32_t load32_le(const uint8_t *u) @@ -109,7 +109,7 @@ COSE_ssize_t cose_crypto_keygen_chachapoly(uint8_t *sk, size_t len)
@@ -105,7 +104,7 @@ COSE_ssize_t cose_crypto_keygen_chachapoly(uint8_t *sk, size_t len)
if (len < 64) { if (len < 64) {
return COSE_ERR_NOMEM; return COSE_ERR_NOMEM;
} }
@ -89,14 +88,14 @@ index 9e4dcbc..d1fcac1 100644
return 64; return 64;
} }
#endif /* CRYPTO_MONOCYPHER_INCLUDE_CHACHAPOLY */ #endif /* CRYPTO_MONOCYPHER_INCLUDE_CHACHAPOLY */
@@ -133,7 +132,7 @@ static void _ed25519_clamp(uint8_t *key) @@ -137,7 +137,7 @@ static void _ed25519_clamp(uint8_t *key)
void cose_crypto_keypair_ed25519(cose_key_t *key) void cose_crypto_keypair_ed25519(cose_key_t *key)
{ {
- randombytes(key->d, COSE_CRYPTO_SIGN_ED25519_SECRETKEYBYTES); - randombytes(key->d, COSE_CRYPTO_SIGN_ED25519_SECRETKEYBYTES);
+ random_bytes(key->d, COSE_CRYPTO_SIGN_ED25519_SECRETKEYBYTES); + random_bytes(key->d, COSE_CRYPTO_SIGN_ED25519_SECRETKEYBYTES);
_ed25519_clamp(key->d); _ed25519_clamp(key->d);
crypto_sign_public_key(key->x, key->d); crypto_ed25519_public_key(key->x, key->d);
} }
-- --
2.21.0 2.21.0

4
pkg/tinycrypt/Makefile
View File

@ -5,5 +5,5 @@ PKG_LICENSE=BSD-3-Clause
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all: Makefile.tinycrypt
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/lib/source/ -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/lib/source/ -f $(CURDIR)/Makefile.tinycrypt -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)

1
pkg/tinycrypt/Makefile.tinycrypt Normal file
View File

@ -0,0 +1 @@
SRC = $(filter-out ecc_platform_specific.c,$(wildcard *.c))