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

Don't use compile-time assertions with sizeof(dynamic length).

Browse Source
This commit is contained in:
Frank Denis 2014-04-15 20:16:23 -07:00
parent 17f8953d3a
commit f288d11910
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
#include <assert.h>
#include <limits.h>
#include <stdint.h>
#include <stdlib.h>
@ -41,8 +42,8 @@ crypto_box_easy(unsigned char *c, const unsigned char *m,
free(c_boxed);
return -1;
}
(void) sizeof(char[m_boxed_len - crypto_box_BOXZEROBYTES ==
mlen + crypto_box_MACBYTES ? 1 : -1]);
assert(m_boxed_len - crypto_box_BOXZEROBYTES ==
mlen + crypto_box_MACBYTES);
memcpy(c, c_boxed + crypto_box_BOXZEROBYTES, mlen + crypto_box_MACBYTES);
free(c_boxed);

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

@ -1,4 +1,5 @@
#include <assert.h>
#include <limits.h>
#include <stdint.h>
#include <stdlib.h>
@ -41,8 +42,8 @@ crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
free(c_boxed);
return -1;
}
(void) sizeof(char[m_boxed_len - crypto_secretbox_BOXZEROBYTES ==
mlen + crypto_secretbox_MACBYTES ? 1 : -1]);
assert(m_boxed_len - crypto_secretbox_BOXZEROBYTES ==
mlen + crypto_secretbox_MACBYTES);
memcpy(c, c_boxed + crypto_secretbox_BOXZEROBYTES,
mlen + crypto_secretbox_MACBYTES);
free(c_boxed);