From aec630132cc851f45a455d97cd79da077b5883de Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 15 Apr 2014 00:21:26 -0700 Subject: [PATCH] Slightly rename args in sodium_bin2hex() for consistency --- src/libsodium/include/sodium/utils.h | 4 ++-- src/libsodium/sodium/utils.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libsodium/include/sodium/utils.h b/src/libsodium/include/sodium/utils.h index 14b6a747..f9f3875a 100644 --- a/src/libsodium/include/sodium/utils.h +++ b/src/libsodium/include/sodium/utils.h @@ -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 } diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index 2da72fa3..a6afd93d 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -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++;