QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Consistency

Browse Source
This commit is contained in:
Frank Denis
2016-04-02 12:08:41 +02:00
parent e50f1e95ab
commit 1853248f0a
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
+1
View File
@@ -787,6 +787,7 @@ crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m, unsigned char *
d |= (mac[i] ^ (T[i] ^ accum[15 - i]));
}
if (d != 0) {
memset(m, 0, mlen);
return -1;
}
}
src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
+14 -20
View File
@@ -65,25 +65,22 @@ crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
const unsigned char *npub,
const unsigned char *k)
{
int ret;
unsigned long long clen = 0ULL;
int ret;
/* LCOV_EXCL_START */
#ifdef UINT64_MAX
if (mlen > UINT64_MAX - crypto_aead_chacha20poly1305_ABYTES) {
if (clen_p != NULL) {
*clen_p = 0ULL;
}
return -1;
abort(); /* LCOV_EXCL_LINE */
}
#endif
/* LCOV_EXCL_STOP */
ret = crypto_aead_chacha20poly1305_encrypt_detached(c,
c + mlen, NULL,
m, mlen,
ad, adlen,
nsec, npub, k);
if (clen_p != NULL) {
*clen_p = mlen + crypto_aead_chacha20poly1305_ABYTES;
if (ret == 0) {
clen = mlen + crypto_aead_chacha20poly1305_ABYTES;
}
*clen_p = clen;
}
return ret;
}
@@ -143,25 +140,22 @@ crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
const unsigned char *npub,
const unsigned char *k)
{
int ret;
unsigned long long clen = 0ULL;
int ret;
/* LCOV_EXCL_START */
#ifdef UINT64_MAX
if (mlen > UINT64_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES) {
if (clen_p != NULL) {
*clen_p = 0ULL;
}
return -1;
abort(); /* LCOV_EXCL_LINE */
}
#endif
/* LCOV_EXCL_STOP */
ret = crypto_aead_chacha20poly1305_ietf_encrypt_detached(c,
c + mlen, NULL,
m, mlen,
ad, adlen,
nsec, npub, k);
if (clen_p != NULL) {
*clen_p = mlen + crypto_aead_chacha20poly1305_ietf_ABYTES;
if (ret == 0) {
clen = mlen + crypto_aead_chacha20poly1305_ietf_ABYTES;
}
*clen_p = clen;
}
return ret;
}