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

Slightly rename args in sodium_bin2hex() for consistency

Browse Source
This commit is contained in:
Frank Denis 2014-04-15 00:21:26 -07:00 committed by evoskuil
parent 44da824038
commit 618b5657d8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,8 @@ SODIUM_EXPORT
int sodium_memcmp(const void * const b1_, const void * const b2_, size_t size);
SODIUM_EXPORT
char *sodium_bin2hex(char * const hex, const size_t hexlen,
const unsigned char *bin, const size_t binlen);
char *sodium_bin2hex(char * const hex, const size_t hex_len,
const unsigned char * const bin, const size_t bin_len);
#ifdef __cplusplus
}

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

@ -77,8 +77,8 @@ _sodium_alignedcalloc(unsigned char ** const unaligned_p, const size_t len)
}
char *
sodium_bin2hex(char * const hex, const size_t hexlen,
const unsigned char *bin, const size_t binlen)
sodium_bin2hex(char * const hex, const size_t hex_len,
const unsigned char * const bin, const size_t bin_len)
{
static const char hexdigits[16] = {
'0', '1', '2', '3', '4', '5', '6', '7',
@ -87,10 +87,10 @@ sodium_bin2hex(char * const hex, const size_t hexlen,
size_t i = (size_t) 0U;
size_t j = (size_t) 0U;
if (binlen >= SIZE_MAX / 2 || hexlen < binlen * 2U) {
if (bin_len >= SIZE_MAX / 2 || hex_len < bin_len * 2U) {
abort();
}
while (i < binlen) {
while (i < bin_len) {
hex[j++] = hexdigits[bin[i] >> 4];
hex[j++] = hexdigits[bin[i] & 0xf];
i++;