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

pkg/libcose: add monocypher and c25519

Browse Source
This commit is contained in:
Francisco Molina 2019-08-12 14:23:10 +02:00
parent 3b8fb0bd80
commit ae1c4f422c
3 changed files with 76 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/libcose/Makefile.dep
View File

@ -2,6 +2,14 @@ USEPKG += nanocbor
USEMODULE += libcose_crypt
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

6
pkg/libcose/Makefile.include
View File

@ -4,6 +4,12 @@ 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
# Declare pseudomodules here to be selfcontained
PSEUDOMODULES += libcose_crypt_%

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

@ -1,14 +1,39 @@
From ed69076abbe83ed256f1e1fbdf74726961c9071e Mon Sep 17 00:00:00 2001
From 0104f8d1558fbd40d25dc48291508b3eac9965fa Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Fri, 5 Jul 2019 14:51:09 +0200
Subject: [PATCH] RIOT: Use RIOT random_bytes function instead of randombytes
---
src/crypt/c25519.c | 5 ++---
src/crypt/hacl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
src/crypt/monocypher.c | 7 +++----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/crypt/c25519.c b/src/crypt/c25519.c
index c23749b..f30e92a 100644
--- a/src/crypt/c25519.c
+++ b/src/crypt/c25519.c
@@ -17,8 +17,7 @@
#include "cose/crypto.h"
#include "cose/crypto/c25519.h"
#include "cose/crypto/selectors.h"
-
-extern void randombytes(uint8_t *target, uint64_t n);
+#include "random.h"
#ifdef CRYPTO_C25519_INCLUDE_ED25519
int cose_crypto_sign_ed25519(const cose_key_t *key, uint8_t *sign, size_t *signlen, uint8_t *msg, unsigned long long int msglen)
@@ -38,7 +37,7 @@ int cose_crypto_verify_ed25519(const cose_key_t *key, const uint8_t *sign, size_
void cose_crypto_keypair_ed25519(cose_key_t *key)
{
- randombytes(key->d, EDSIGN_SECRET_KEY_SIZE);
+ random_bytes(key->d, EDSIGN_SECRET_KEY_SIZE);
edsign_sec_to_pub(key->x, key->d);
}
diff --git a/src/crypt/hacl.c b/src/crypt/hacl.c
index c24d751732..3bdcabf95e 100644
index c24d751..3bdcabf 100644
--- a/src/crypt/hacl.c
+++ b/src/crypt/hacl.c
@@ -19,10 +19,10 @@
@ -41,6 +66,38 @@ index c24d751732..3bdcabf95e 100644
return COSE_CRYPTO_AEAD_CHACHA20POLY1305_NONCEBYTES;
}
#endif /* CRYPTO_HACL_INCLUDE_CHACHAPOLY */
--
2.22.0
diff --git a/src/crypt/monocypher.c b/src/crypt/monocypher.c
index 9e4dcbc..d1fcac1 100644
--- a/src/crypt/monocypher.c
+++ b/src/crypt/monocypher.c
@@ -17,8 +17,7 @@
#include <monocypher.h>
#include "cose/crypto.h"
#include "cose/crypto/selectors.h"
-
-extern void randombytes(uint8_t *target, uint64_t n);
+#include "random.h"
#ifdef CRYPTO_MONOCYPHER_INCLUDE_CHACHAPOLY
static uint32_t load32_le(const uint8_t *u)
@@ -105,7 +104,7 @@ COSE_ssize_t cose_crypto_keygen_chachapoly(uint8_t *sk, size_t len)
if (len < 64) {
return COSE_ERR_NOMEM;
}
- randombytes((unsigned char*)sk, 64);
+ random_bytes((unsigned char*)sk, 64);
return 64;
}
#endif /* CRYPTO_MONOCYPHER_INCLUDE_CHACHAPOLY */
@@ -133,7 +132,7 @@ static void _ed25519_clamp(uint8_t *key)
void cose_crypto_keypair_ed25519(cose_key_t *key)
{
- randombytes(key->d, COSE_CRYPTO_SIGN_ED25519_SECRETKEYBYTES);
+ random_bytes(key->d, COSE_CRYPTO_SIGN_ED25519_SECRETKEYBYTES);
_ed25519_clamp(key->d);
crypto_sign_public_key(key->x, key->d);
}
--
2.21.0