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

size -> len, for consistency

Browse Source
This commit is contained in:
Frank Denis 2014-04-15 00:42:05 -07:00
parent 219db714cf
commit 17f8953d3a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsodium/include/sodium/utils.h
View File

@ -23,7 +23,7 @@ SODIUM_EXPORT
void sodium_memzero(void * const pnt, const size_t len); void sodium_memzero(void * const pnt, const size_t len);
SODIUM_EXPORT SODIUM_EXPORT
int sodium_memcmp(const void * const b1_, const void * const b2_, size_t size); int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len);
SODIUM_EXPORT SODIUM_EXPORT
char *sodium_bin2hex(char * const hex, const size_t hex_maxlen, char *sodium_bin2hex(char * const hex, const size_t hex_maxlen,

4
src/libsodium/sodium/utils.c
View File

@ -36,14 +36,14 @@ sodium_memzero(void * const pnt, const size_t len)
} }
int int
sodium_memcmp(const void * const b1_, const void * const b2_, size_t size) sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
{ {
const unsigned char *b1 = (const unsigned char *) b1_; const unsigned char *b1 = (const unsigned char *) b1_;
const unsigned char *b2 = (const unsigned char *) b2_; const unsigned char *b2 = (const unsigned char *) b2_;
size_t i; size_t i;
unsigned char d = (unsigned char) 0U; unsigned char d = (unsigned char) 0U;
for (i = 0U; i < size; i++) { for (i = 0U; i < len; i++) {
d |= b1[i] ^ b2[i]; d |= b1[i] ^ b2[i];
} }
return (int) ((1 & ((d - 1) >> 8)) - 1); return (int) ((1 & ((d - 1) >> 8)) - 1);