Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix: Internal state error during multi-packet decryption #57

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix: Internal state error during multi-packet decryption #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion examples/ascon_aead_enc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ int main(void)
{
int ret = 1;
void *ctx = NULL;
const char *plaintext = "hello world";
const char *plaintext = "hello world, 12345678";
const char *ad = "0123456789abcdef";
unsigned char *key = tsm_hex2buf("0123456789abcdef0123456789abcdef");
unsigned char *iv = tsm_hex2buf("0123456789abcdef0123456789abcdef");
unsigned char out[1024];
unsigned char tag[TSM_ASCON_AEAD_TAG_LEN];
size_t outl, tmplen;
void *ctx_dec = NULL;
unsigned char dec_out[1024];
size_t dec_outl = 0;

if (key == NULL || iv == NULL) {
goto err;
Expand Down Expand Up @@ -64,9 +67,43 @@ int main(void)

printf("\n");

ctx_dec = tsm_ascon_aead_ctx_new();
if (ctx == NULL) {
goto err;
}

if (tsm_ascon_aead_init(ctx_dec, TSM_ASCON_AEAD_128, key, iv, TSM_CIPH_FLAG_DECRYPT) != TSM_OK
|| tsm_ascon_aead_set_tag(ctx_dec, tag)
|| tsm_ascon_aead_update(ctx_dec, (const unsigned char *)ad, strlen(ad), NULL, NULL) != TSM_OK
|| tsm_ascon_aead_update(ctx_dec,
out,
3,
dec_out + dec_outl,
&tmplen)
!= TSM_OK
|| (dec_outl += tmplen, 0)
|| tsm_ascon_aead_update(ctx_dec,
out + 3,
outl - 3,
dec_out + dec_outl,
&tmplen)
!= TSM_OK
|| (dec_outl += tmplen, 0)
|| tsm_ascon_aead_final(ctx_dec, dec_out + dec_outl, &tmplen) != TSM_OK) {
goto err;
}

dec_outl += tmplen;

dec_out[dec_outl] = 0;
printf("ASCON_AEAD_Decrypt=%s", dec_out);

printf("\n");

ret = 0;
err:
tsm_ascon_aead_ctx_free(ctx);
tsm_ascon_aead_ctx_free(ctx_dec);
tsm_free(key);
tsm_free(iv);
return ret;
Expand Down
15 changes: 12 additions & 3 deletions src/ascon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,23 @@ int tsm_ascon_aead_update(void *ctx, const unsigned char *in, size_t inl, unsign
in += c->block_size - c->buf_len;
inl -= c->block_size - c->buf_len;
if (c->mode == TSM_ASCON_AEAD_128) {
c->s.x[0] ^= load_u64(c->buf, 8);
uint64_t c0 = load_u64(c->buf, 8);
c->s.x[0] ^= c0;
store_u64(c->s.x[0], 8, out);
if (c->flags & TSM_CIPH_FLAG_DECRYPT)
c->s.x[0] = c0;
P6(&c->s);
} else {
c->s.x[0] ^= load_u64(c->buf, 8);
c->s.x[1] ^= load_u64(c->buf + 8, 8);
uint64_t c0 = load_u64(c->buf, 8);
uint64_t c1 = load_u64(c->buf + 8, 8);
c->s.x[0] ^= c0;
c->s.x[1] ^= c1;
store_u64(c->s.x[0], 8, out);
store_u64(c->s.x[1], 8, out + 8);
if (c->flags & TSM_CIPH_FLAG_DECRYPT) {
c->s.x[0] = c0;
c->s.x[1] = c1;
}
P8(&c->s);
}
c->buf_len = 0;
Expand Down
Loading