sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto: fix multiple definition of `poly1305_init'

Browse Source 
apps/crypto/libtomcrypt/libtomcrypt/src/mac/poly1305/poly1305.c:90: multiple definition of `poly1305_init';
nuttx/crypto/poly1305.c:51: first defined here
Signed-off-by: makejian <makejian@xiaomi.com>
This commit is contained in:
makejian 2023-08-22 14:54:01 +08:00 committed by Alan Carvalho de Assis
parent cf395cf3fb
commit f4f2c9ed49
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/chachapoly.c
View File

@ -101,7 +101,7 @@ void chacha20_poly1305_reinit(FAR void *xctx, FAR const uint8_t *iv,
chacha_ivsetup((FAR chacha_ctx *)&ctx->chacha, iv, ctx->nonce);
chacha_encrypt_bytes((FAR chacha_ctx *)&ctx->chacha, ctx->key, ctx->key,
POLY1305_KEYLEN);
poly1305_init((FAR poly1305_state *)&ctx->poly, ctx->key);
poly1305_begin((FAR poly1305_state *)&ctx->poly, ctx->key);
}
int chacha20_poly1305_update(FAR void *xctx, FAR const uint8_t *data,
@ -160,7 +160,7 @@ void chacha20poly1305_encrypt(
chacha_keysetup(&ctx, key, CHACHA20POLY1305_KEY_SIZE * 8);
chacha_ivsetup(&ctx, (FAR uint8_t *) &le_nonce, NULL);
chacha_encrypt_bytes(&ctx, b.b0, b.b0, sizeof(b.b0));
poly1305_init(&poly1305_ctx, b.b0);
poly1305_begin(&poly1305_ctx, b.b0);
poly1305_update(&poly1305_ctx, ad, ad_len);
poly1305_update(&poly1305_ctx, pad0, (0x10 - ad_len) & 0xf);
@ -214,7 +214,7 @@ int chacha20poly1305_decrypt(
chacha_keysetup(&ctx, key, CHACHA20POLY1305_KEY_SIZE * 8);
chacha_ivsetup(&ctx, (FAR uint8_t *) &le_nonce, NULL);
chacha_encrypt_bytes(&ctx, b.b0, b.b0, sizeof(b.b0));
poly1305_init(&poly1305_ctx, b.b0);
poly1305_begin(&poly1305_ctx, b.b0);
poly1305_update(&poly1305_ctx, ad, ad_len);
poly1305_update(&poly1305_ctx, pad0, (0x10 - ad_len) & 0xf);

2
crypto/poly1305.c
View File

@ -47,7 +47,7 @@ static void U32TO8(FAR unsigned char *p, unsigned long v)
* Public Functions
****************************************************************************/
void poly1305_init(FAR poly1305_state *st, FAR const unsigned char *key)
void poly1305_begin(FAR poly1305_state *st, FAR const unsigned char *key)
{
/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */

2
include/crypto/poly1305.h
View File

@ -29,7 +29,7 @@ typedef struct poly1305_state
unsigned char final;
} poly1305_state;
void poly1305_init(FAR poly1305_state *, FAR const unsigned char *);
void poly1305_begin(FAR poly1305_state *, FAR const unsigned char *);
void poly1305_update(FAR poly1305_state *,
FAR const unsigned char *, size_t);
void poly1305_finish(FAR poly1305_state *, FAR unsigned char *);