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

strnlen() may not be available everywhere

Browse Source
This commit is contained in:
Frank Denis 2018-07-22 21:54:38 +02:00
parent 922e4dcd9e
commit 7cdf3f0e84
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c
View File

@ -52,6 +52,17 @@ pickparams(unsigned long long opslimit, const size_t memlimit,
return 0; return 0;
} }
static size_t
sodium_strnlen(const char *str, size_t maxlen)
{
size_t i = 0U;
while (i < maxlen && str[i] != 0) {
i++;
}
return i;
}
size_t size_t
crypto_pwhash_scryptsalsa208sha256_bytes_min(void) crypto_pwhash_scryptsalsa208sha256_bytes_min(void)
{ {
@ -234,7 +245,7 @@ crypto_pwhash_scryptsalsa208sha256_str_verify(
escrypt_local_t escrypt_local; escrypt_local_t escrypt_local;
int ret = -1; int ret = -1;
if (strnlen(str, crypto_pwhash_scryptsalsa208sha256_STRBYTES) != if (sodium_strnlen(str, crypto_pwhash_scryptsalsa208sha256_STRBYTES) !=
crypto_pwhash_scryptsalsa208sha256_STRBYTES - 1U) { crypto_pwhash_scryptsalsa208sha256_STRBYTES - 1U) {
return -1; return -1;
} }
@ -268,7 +279,7 @@ crypto_pwhash_scryptsalsa208sha256_str_needs_rehash(
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
if (strnlen(str, crypto_pwhash_scryptsalsa208sha256_STRBYTES) != if (sodium_strnlen(str, crypto_pwhash_scryptsalsa208sha256_STRBYTES) !=
crypto_pwhash_scryptsalsa208sha256_STRBYTES - 1U) { crypto_pwhash_scryptsalsa208sha256_STRBYTES - 1U) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;