kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-20 02:25:14 -07:00
Code Releases Wiki Activity

Add memory locking to crypto_box_easy

Browse Source
This commit is contained in:
Frank Denis 2014-05-08 15:11:54 -07:00
parent 8a8463e4ac
commit 28d36d5207
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsodium/crypto_box/crypto_box_easy.c
View File

@ -34,9 +34,10 @@ crypto_box_easy(unsigned char *c, const unsigned char *m,
return -1; return -1;
} }
memset(m_boxed, 0, crypto_box_ZEROBYTES); memset(m_boxed, 0, crypto_box_ZEROBYTES);
sodium_mlock(m_boxed, m_boxed_len);
memcpy(m_boxed + crypto_box_ZEROBYTES, m, mlen); memcpy(m_boxed + crypto_box_ZEROBYTES, m, mlen);
rc = crypto_box(c_boxed, m_boxed, m_boxed_len, n, pk, sk); rc = crypto_box(c_boxed, m_boxed, m_boxed_len, n, pk, sk);
sodium_memzero(m_boxed, m_boxed_len); sodium_munlock(m_boxed, m_boxed_len);
free(m_boxed); free(m_boxed);
if (rc != 0) { if (rc != 0) {
free(c_boxed); free(c_boxed);
@ -76,14 +77,17 @@ crypto_box_open_easy(unsigned char *m, const unsigned char *c,
free(c_boxed); free(c_boxed);
return -1; return -1;
} }
sodium_mlock(m_boxed, m_boxed_len);
rc = crypto_box_open(m_boxed, c_boxed, rc = crypto_box_open(m_boxed, c_boxed,
(unsigned long long) c_boxed_len, n, pk, sk); (unsigned long long) c_boxed_len, n, pk, sk);
free(c_boxed); free(c_boxed);
if (rc != 0) { if (rc != 0) {
sodium_munlock(m_boxed, m_boxed_len);
free(m_boxed); free(m_boxed);
return -1; return -1;
} }
memcpy(m, m_boxed + crypto_box_ZEROBYTES, clen - crypto_box_MACBYTES); memcpy(m, m_boxed + crypto_box_ZEROBYTES, clen - crypto_box_MACBYTES);
sodium_munlock(m_boxed, m_boxed_len);
free(m_boxed); free(m_boxed);
return 0; return 0;