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

Proper overlapping check; memmove() was called when it was superfluous.

Browse Source
This commit is contained in:
Frank Denis 2015-01-15 00:44:28 +01:00
parent cb73ed5fe8
commit 2a562f8986
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +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) {
if (((uintptr_t) c >= (uintptr_t) m &&
(uintptr_t) c - (uintptr_t) m < mlen) ||
((uintptr_t) m >= (uintptr_t) c &&
(uintptr_t) m - (uintptr_t) c < mlen)) {
memmove(c, m, mlen);
m = c;
}
@ -95,7 +98,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) {
if (((uintptr_t) c >= (uintptr_t) m &&
(uintptr_t) c - (uintptr_t) m < clen) ||
((uintptr_t) m >= (uintptr_t) c &&
(uintptr_t) m - (uintptr_t) c < clen)) {
memmove(m, c, clen);
c = m;
}