aead/chacha20-poly1305: reflect that the keysetup is only for {,X}ChaCha20

This commit is contained in:
Lucas Gabriel Vuotto 2024-06-09 02:21:06 +00:00
parent d2817487e8
commit 62eb1ea6f8

View File

@ -29,7 +29,7 @@
static const uint8_t zeropad[16]; static const uint8_t zeropad[16];
static int static int
aead_poly1305_keysetup(struct lc_cipher_ctx *cctx, chacha20_xchacha20_keysetup(struct lc_cipher_ctx *cctx,
uint8_t akey[LC_POLY1305_KEYLEN], const void *initparams) uint8_t akey[LC_POLY1305_KEYLEN], const void *initparams)
{ {
size_t i, olen, akeylen; size_t i, olen, akeylen;
@ -90,7 +90,7 @@ chacha20_poly1305_seal(uint8_t *out, size_t *outlen, const void *initparams,
cparams.nonce[i] = params->nonce[i]; cparams.nonce[i] = params->nonce[i];
cparams.counter = 0; cparams.counter = 0;
if (!aead_poly1305_keysetup(cctx, aparams.key, &cparams)) if (!chacha20_xchacha20_keysetup(cctx, aparams.key, &cparams))
goto cleanup; goto cleanup;
if (!lc_auth_init(actx, &aparams) || if (!lc_auth_init(actx, &aparams) ||
@ -179,7 +179,7 @@ xchacha20_poly1305_seal(uint8_t *out, size_t *outlen, const void *initparams,
cparams.nonce[i] = params->nonce[i]; cparams.nonce[i] = params->nonce[i];
cparams.counter = 0; cparams.counter = 0;
if (!aead_poly1305_keysetup(cctx, aparams.key, &cparams)) if (!chacha20_xchacha20_keysetup(cctx, aparams.key, &cparams))
goto cleanup; goto cleanup;
if (!lc_auth_init(actx, &aparams) || if (!lc_auth_init(actx, &aparams) ||
@ -270,7 +270,7 @@ chacha20_poly1305_open(uint8_t *out, size_t *outlen, const void *initparams,
cparams.nonce[i] = params->nonce[i]; cparams.nonce[i] = params->nonce[i];
cparams.counter = 0; cparams.counter = 0;
if (!aead_poly1305_keysetup(cctx, aparams.key, &cparams)) if (!chacha20_xchacha20_keysetup(cctx, aparams.key, &cparams))
goto cleanup; goto cleanup;
if (!lc_auth_init(actx, &aparams) || if (!lc_auth_init(actx, &aparams) ||
@ -365,7 +365,7 @@ xchacha20_poly1305_open(uint8_t *out, size_t *outlen, const void *initparams,
cparams.nonce[i] = params->nonce[i]; cparams.nonce[i] = params->nonce[i];
cparams.counter = 0; cparams.counter = 0;
if (!aead_poly1305_keysetup(cctx, aparams.key, &cparams)) if (!chacha20_xchacha20_keysetup(cctx, aparams.key, &cparams))
goto cleanup; goto cleanup;
if (!lc_auth_init(actx, &aparams) || if (!lc_auth_init(actx, &aparams) ||