Skip to content

Commit 6ef3a43

Browse files
authored
Merge pull request #584 from Ramblurr/fix/libaegis-0.9
fix aegis call sites after breaking changes in 0.9.0
2 parents 34d4d64 + b1a50a1 commit 6ef3a43

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

lib/libaegis.h

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,19 @@ static void aegis128l_init(ptls_aead_context_t *_ctx, uint64_t seq, const void *
6161
static size_t aegis128l_encrypt_update(ptls_aead_context_t *_ctx, void *output, const void *input, size_t inlen)
6262
{
6363
struct aegis128l_context_t *ctx = (struct aegis128l_context_t *)_ctx;
64-
size_t written;
6564

66-
aegis128l_state_encrypt_update(&ctx->st, (uint8_t *)output, inlen + aegis128l_TAILBYTES_MAX, &written, (const uint8_t *)input,
67-
inlen);
65+
aegis128l_state_encrypt_update(&ctx->st, (uint8_t *)output, (const uint8_t *)input, inlen);
6866

69-
return written;
67+
return inlen;
7068
}
7169

7270
static size_t aegis128l_encrypt_final(ptls_aead_context_t *_ctx, void *output)
7371
{
7472
struct aegis128l_context_t *ctx = (struct aegis128l_context_t *)_ctx;
75-
size_t written;
7673

77-
aegis128l_state_encrypt_final(&ctx->st, (uint8_t *)output, aegis128l_TAILBYTES_MAX + PTLS_AEGIS128L_TAG_SIZE, &written,
78-
PTLS_AEGIS128L_TAG_SIZE);
74+
aegis128l_state_encrypt_final(&ctx->st, (uint8_t *)output, PTLS_AEGIS128L_TAG_SIZE);
7975

80-
return written;
76+
return PTLS_AEGIS128L_TAG_SIZE;
8177
}
8278

8379
static size_t aegis128l_decrypt_oneshot(ptls_aead_context_t *_ctx, void *output, const void *input, size_t inlen, uint64_t seq,
@@ -177,23 +173,19 @@ static void aegis256_init(ptls_aead_context_t *_ctx, uint64_t seq, const void *a
177173
static size_t aegis256_encrypt_update(ptls_aead_context_t *_ctx, void *output, const void *input, size_t inlen)
178174
{
179175
struct aegis256_context_t *ctx = (struct aegis256_context_t *)_ctx;
180-
size_t written;
181176

182-
aegis256_state_encrypt_update(&ctx->st, (uint8_t *)output, inlen + aegis256_TAILBYTES_MAX, &written, (const uint8_t *)input,
183-
inlen);
177+
aegis256_state_encrypt_update(&ctx->st, (uint8_t *)output, (const uint8_t *)input, inlen);
184178

185-
return written;
179+
return inlen;
186180
}
187181

188182
static size_t aegis256_encrypt_final(ptls_aead_context_t *_ctx, void *output)
189183
{
190184
struct aegis256_context_t *ctx = (struct aegis256_context_t *)_ctx;
191-
size_t written;
192185

193-
aegis256_state_encrypt_final(&ctx->st, (uint8_t *)output, aegis256_TAILBYTES_MAX + PTLS_AEGIS256_TAG_SIZE, &written,
194-
PTLS_AEGIS256_TAG_SIZE);
186+
aegis256_state_encrypt_final(&ctx->st, (uint8_t *)output, PTLS_AEGIS256_TAG_SIZE);
195187

196-
return written;
188+
return PTLS_AEGIS256_TAG_SIZE;
197189
}
198190

199191
static size_t aegis256_decrypt_oneshot(ptls_aead_context_t *_ctx, void *output, const void *input, size_t inlen, uint64_t seq,

0 commit comments

Comments
 (0)