kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 20:15:19 -07:00
Code Releases Wiki Activity

lcov: annotate the actual "can't happen" lines.

Browse Source
This commit is contained in:
Frank Denis 2014-09-18 22:22:51 -07:00
parent 4de4e57a8e
commit abd5df9ba1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
View File

@ -171,8 +171,8 @@ escrypt_r(escrypt_local_t * local, const uint8_t * passwd, size_t passwdlen,
dst = encode64(dst, buflen - (dst - buf), hash, sizeof(hash)); dst = encode64(dst, buflen - (dst - buf), hash, sizeof(hash));
sodium_memzero(hash, sizeof hash); sodium_memzero(hash, sizeof hash);
if (!dst || dst >= buf + buflen) { /* Can't happen LCOV_EXCL_LINE */ if (!dst || dst >= buf + buflen) {
return NULL; return NULL; /* Can't happen LCOV_EXCL_LINE */
} }
*dst = 0; /* NUL termination */ *dst = 0; /* NUL termination */
@ -205,16 +205,16 @@ escrypt_gensalt_r(uint32_t N_log2, uint32_t r, uint32_t p,
*dst++ = itoa64[N_log2]; *dst++ = itoa64[N_log2];
dst = encode64_uint32(dst, buflen - (dst - buf), r, 30); dst = encode64_uint32(dst, buflen - (dst - buf), r, 30);
if (!dst) { /* Can't happen LCOV_EXCL_LINE */ if (!dst) {
return NULL; return NULL; /* Can't happen LCOV_EXCL_LINE */
} }
dst = encode64_uint32(dst, buflen - (dst - buf), p, 30); dst = encode64_uint32(dst, buflen - (dst - buf), p, 30);
if (!dst) { /* Can't happen LCOV_EXCL_LINE */ if (!dst) {
return NULL; return NULL; /* Can't happen LCOV_EXCL_LINE */
} }
dst = encode64(dst, buflen - (dst - buf), src, srclen); dst = encode64(dst, buflen - (dst - buf), src, srclen);
if (!dst || dst >= buf + buflen) { /* Can't happen LCOV_EXCL_LINE */ if (!dst || dst >= buf + buflen) {
return NULL; return NULL; /* Can't happen LCOV_EXCL_LINE */
} }
*dst = 0; /* NUL termination */ *dst = 0; /* NUL termination */

4
src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
View File

@ -365,9 +365,9 @@ escrypt_kdf_sse(escrypt_local_t * local,
} }
if (local->size < need) { if (local->size < need) {
if (free_region(local)) if (free_region(local))
return -1; return -1; /* LCOV_EXCL_LINE */
if (!alloc_region(local, need)) if (!alloc_region(local, need))
return -1; return -1; /* LCOV_EXCL_LINE */
} }
B = (uint8_t *)local->aligned; B = (uint8_t *)local->aligned;
V = (uint32_t *)((uint8_t *)B + B_size); V = (uint32_t *)((uint8_t *)B + B_size);