aead/chacha20-poly1305: use chacha20_x_final instead of reaching into chacha20_ctx guts
This commit is contained in:
parent
11b86db9db
commit
5bd46fffa6
@ -64,8 +64,8 @@ chacha20_poly1305_seal(const uint8_t *key, size_t keylen, const uint8_t *iv,
|
|||||||
!chacha20_x_update(&cctx, poly1305_key, &olen, poly1305_key,
|
!chacha20_x_update(&cctx, poly1305_key, &olen, poly1305_key,
|
||||||
LC_POLY1305_KEYLEN))
|
LC_POLY1305_KEYLEN))
|
||||||
return 0;
|
return 0;
|
||||||
for (i = 0; i < LC_POLY1305_KEYLEN / sizeof(uint32_t); i++)
|
if (!chacha20_x_final(&cctx, poly1305_key + olen, &olen))
|
||||||
store32le(&poly1305_key[i * 4], cctx.s[i]);
|
return 0;
|
||||||
|
|
||||||
if (!poly1305_init(&pctx, poly1305_key, LC_POLY1305_KEYLEN) ||
|
if (!poly1305_init(&pctx, poly1305_key, LC_POLY1305_KEYLEN) ||
|
||||||
!poly1305_update(&pctx, aad, aadlen))
|
!poly1305_update(&pctx, aad, aadlen))
|
||||||
@ -140,8 +140,8 @@ chacha20_poly1305_open(const uint8_t *key, size_t keylen, const uint8_t *iv,
|
|||||||
!chacha20_x_update(&cctx, poly1305_key, &olen, poly1305_key,
|
!chacha20_x_update(&cctx, poly1305_key, &olen, poly1305_key,
|
||||||
LC_POLY1305_KEYLEN))
|
LC_POLY1305_KEYLEN))
|
||||||
return 0;
|
return 0;
|
||||||
for (i = 0; i < LC_POLY1305_KEYLEN / sizeof(uint32_t); i++)
|
if (!chacha20_x_final(&cctx, poly1305_key + olen, &olen))
|
||||||
store32le(&poly1305_key[i * 4], cctx.s[i]);
|
return 0;
|
||||||
|
|
||||||
if (!poly1305_init(&pctx, poly1305_key, LC_POLY1305_KEYLEN) ||
|
if (!poly1305_init(&pctx, poly1305_key, LC_POLY1305_KEYLEN) ||
|
||||||
!poly1305_update(&pctx, aad, aadlen))
|
!poly1305_update(&pctx, aad, aadlen))
|
||||||
|
Loading…
Reference in New Issue
Block a user