Lucas/lilcrypto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wycheproof_aead: adapt to the new api

Browse Source
This commit is contained in:
Lucas Gabriel Vuotto 2024-06-20 15:53:57 +00:00
parent 5c1325ed11
commit dbf81b49d5
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
wycheproof_aead.c
View File

@ -268,24 +268,26 @@ static int
aead_poly1305_runner(const struct lc_aead_impl *impl, const struct testcase *c, aead_poly1305_runner(const struct lc_aead_impl *impl, const struct testcase *c,
void *params, int verbose) void *params, int verbose)
{ {
uint8_t *buf, *encout, *decout; uint8_t *encout, *decout, *tag;
size_t aeadlen, encoutlen, decoutlen; size_t encoutlen, decoutlen, taglen;
if (!lc_aead_seal(impl, NULL, &encoutlen, params, c->aad, c->aadlen, if (!lc_aead_seal(impl, NULL, &encoutlen, NULL, &taglen, params,
c->msg, c->msglen)) c->aad, c->aadlen, c->msg, c->msglen))
return 0; return 0;
encout = malloc(encoutlen); encout = malloc(encoutlen);
if (encout == NULL) tag = malloc(taglen);
if (encout == NULL || tag == NULL)
err(1, "out of memory"); err(1, "out of memory");
if (!lc_aead_seal(impl, encout, &encoutlen, params, c->aad, c->aadlen,
c->msg, c->msglen)) if (!lc_aead_seal(impl, encout, &encoutlen, tag, &taglen, params,
c->aad, c->aadlen, c->msg, c->msglen))
return 0; return 0;
if (c->ctlen != encoutlen - LC_POLY1305_TAGLEN || if (c->ctlen != encoutlen ||
!lc_ct_cmp(encout, c->ct, c->ctlen)) { !lc_ct_cmp(encout, c->ct, c->ctlen)) {
if (verbose) { if (verbose) {
fprintf(stderr, "ct (%zu, %zu)\n", c->ctlen, fprintf(stderr, "ct (%zu, %zu)\n", c->ctlen,
encoutlen - LC_POLY1305_TAGLEN); encoutlen);
lc_hexdump_fp(stderr, c->msg, c->msglen); lc_hexdump_fp(stderr, c->msg, c->msglen);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
lc_hexdump_fp(stderr, c->ct, c->ctlen); lc_hexdump_fp(stderr, c->ct, c->ctlen);
@ -297,36 +299,27 @@ aead_poly1305_runner(const struct lc_aead_impl *impl, const struct testcase *c,
return 0; return 0;
} }
if (c->taglenarg != LC_POLY1305_TAGLEN || if (c->taglenarg != LC_POLY1305_TAGLEN ||
!lc_ct_cmp(encout + c->ctlen, c->tag, LC_POLY1305_TAGLEN)) { !lc_ct_cmp(tag, c->tag, LC_POLY1305_TAGLEN)) {
if (verbose) { if (verbose) {
fprintf(stderr, "tag (%zu, %zu)\n", c->taglenarg, fprintf(stderr, "tag (%zu, %zu)\n", c->taglenarg,
(size_t)LC_POLY1305_TAGLEN); (size_t)LC_POLY1305_TAGLEN);
lc_hexdump_fp(stderr, c->tag, c->taglen); lc_hexdump_fp(stderr, c->tag, c->taglen);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
lc_hexdump_fp(stderr, encout + c->ctlen, lc_hexdump_fp(stderr, tag, LC_POLY1305_TAGLEN);
LC_POLY1305_TAGLEN);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
return 0; return 0;
} }
/* Decryption. */ /* Decryption. */
if (!lc_aead_open(impl, NULL, &decoutlen, params, c->tag, c->taglen,
aeadlen = c->msglen + c->taglen; c->aad, c->aadlen, c->ct, c->ctlen))
buf = malloc(aeadlen);
if (buf == NULL)
err(1, "out of memory");
memcpy(buf, c->ct, c->ctlen);
memcpy(buf + c->ctlen, c->tag, c->taglen);
if (!lc_aead_open(impl, NULL, &decoutlen, params, c->aad, c->aadlen,
buf, aeadlen))
return 0; return 0;
decout = malloc(decoutlen); decout = malloc(decoutlen);
if (decout == NULL) if (decout == NULL)
err(1, "out of memory"); err(1, "out of memory");
if (!lc_aead_open(impl, decout, &decoutlen, params, c->aad, c->aadlen, if (!lc_aead_open(impl, decout, &decoutlen, params, c->tag, c->taglen,
buf, aeadlen)) c->aad, c->aadlen, c->ct, c->ctlen))
return 0; return 0;
if (c->msglen != decoutlen || !lc_ct_cmp(decout, c->msg, c->msglen)) { if (c->msglen != decoutlen || !lc_ct_cmp(decout, c->msg, c->msglen)) {
@ -362,6 +355,14 @@ chacha20_poly1305_runner(const struct testcase *c, int verbose)
return 0; return 0;
memcpy(params.nonce, c->iv, LC_CHACHA20_NONCELEN); memcpy(params.nonce, c->iv, LC_CHACHA20_NONCELEN);
params.auth = lc_auth_ctx_new(lc_auth_impl_poly1305());
params.cipher = lc_cipher_ctx_new(lc_cipher_impl_chacha20());
if (params.auth == NULL || params.cipher == NULL) {
lc_auth_ctx_free(params.auth);
lc_cipher_ctx_free(params.cipher);
return 0;
}
return aead_poly1305_runner(lc_aead_impl_chacha20_poly1305(), c, return aead_poly1305_runner(lc_aead_impl_chacha20_poly1305(), c,
&params, verbose); &params, verbose);
} }
@ -381,6 +382,14 @@ xchacha20_poly1305_runner(const struct testcase *c, int verbose)
return 0; return 0;
memcpy(params.nonce, c->iv, LC_XCHACHA20_NONCELEN); memcpy(params.nonce, c->iv, LC_XCHACHA20_NONCELEN);
params.auth = lc_auth_ctx_new(lc_auth_impl_poly1305());
params.cipher = lc_cipher_ctx_new(lc_cipher_impl_xchacha20());
if (params.auth == NULL || params.cipher == NULL) {
lc_auth_ctx_free(params.auth);
lc_cipher_ctx_free(params.cipher);
return 0;
}
return aead_poly1305_runner(lc_aead_impl_xchacha20_poly1305(), c, return aead_poly1305_runner(lc_aead_impl_xchacha20_poly1305(), c,
&params, verbose); &params, verbose);
} }