cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support overlapping input and output regions in crypto_secretbox_detached()

Browse Source 
crypto_stream_salsa20() doesn't support overlapping input and output regions,
except when they are aliases.
This commit is contained in:
Frank Denis 2014-10-03 13:22:57 -07:00
parent 4099618de2
commit 9f6d37d9c6
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsodium/crypto_secretbox/crypto_secretbox_easy.c
View File

@ -29,6 +29,10 @@ crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
crypto_core_hsalsa20(subkey, n, k, sigma);
if (c - m < mlen || c - m > -mlen) {
memmove(c, m, mlen);
m = c;
}
memset(block0, 0U, crypto_secretbox_ZEROBYTES);
(void) sizeof(int[64U >= crypto_secretbox_ZEROBYTES ? 1 : -1]);
mlen0 = mlen;
@ -91,6 +95,10 @@ crypto_secretbox_open_detached(unsigned char *m, const unsigned char *c,
sodium_memzero(subkey, sizeof subkey);
return -1;
}
if (m - c < clen || m - c > -clen) {
memmove(m, c, clen);
c = m;
}
mlen0 = clen;
if (mlen0 > 64U - crypto_secretbox_ZEROBYTES) {
mlen0 = 64U - crypto_secretbox_ZEROBYTES;

16
test/default/secretbox_easy2.c
View File

@ -25,13 +25,25 @@ int main(void)
for (i = 0; i < mlen + crypto_secretbox_MACBYTES - 1; i++) {
if (crypto_secretbox_open_easy(m2, c, i, nonce, k) == 0) {
printf("short open() should have failed");
printf("short open() should have failed\n");
return 1;
}
}
crypto_secretbox_detached(c, mac, m, mlen, nonce, k);
crypto_secretbox_open_detached(m2, c, mac, mlen, nonce, k);
if (crypto_secretbox_open_detached(m2, c, mac, mlen, nonce, k) != 0) {
printf("crypto_secretbox_open_detached() failed\n");
}
printf("%d\n", memcmp(m, m2, mlen));
memcpy(c, m, mlen);
crypto_secretbox_easy(c, c, mlen, nonce, k);
printf("%d\n", memcmp(m, c, mlen) == 0);
printf("%d\n", memcmp(m, c + crypto_secretbox_MACBYTES, mlen) == 0);
if (crypto_secretbox_open_easy(c, c, mlen + crypto_secretbox_MACBYTES, nonce,
k) != 0) {
printf("crypto_secretbox_open_easy() failed\n");
}
printf("%d\n", memcmp(m, c, mlen));
return 0;
}

3
test/default/secretbox_easy2.exp
View File

@ -1,2 +1,5 @@
0
0
0
0
0