commit 276d07a88a3b595aff9e28c7f1862563d2751b55 Author: Chelsea H. Komlo chelsea.komlo@gmail.com Date: Thu Nov 17 22:45:24 2016 -0500
crypto_digest returns expected error value of -1 --- src/common/crypto.c | 10 ++++++---- src/or/rendservice.c | 2 +- src/or/routerparse.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/common/crypto.c b/src/common/crypto.c index fff516c..f59b674 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1506,7 +1506,7 @@ crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out) if (crypto_pk_get_digest(pk, digest)) { return -1; } - if (crypto_digest(hashed_digest, digest, DIGEST_LEN)) { + if (crypto_digest(hashed_digest, digest, DIGEST_LEN) < 0) { return -1; } base16_encode(fp_out, FINGERPRINT_LEN + 1, hashed_digest, DIGEST_LEN); @@ -1700,14 +1700,16 @@ crypto_cipher_decrypt_with_iv(const char *key,
/** Compute the SHA1 digest of the <b>len</b> bytes on data stored in * <b>m</b>. Write the DIGEST_LEN byte result into <b>digest</b>. - * Return 0 on success, 1 on failure. + * Return 0 on success, -1 on failure. */ int crypto_digest(char *digest, const char *m, size_t len) { tor_assert(m); tor_assert(digest); - return (SHA1((const unsigned char*)m,len,(unsigned char*)digest) == NULL); + if(SHA1((const unsigned char*)m,len,(unsigned char*)digest) == NULL) + return -1; + return 0; }
/** Compute a 256-bit digest of <b>len</b> bytes in data stored in <b>m</b>, @@ -2628,7 +2630,7 @@ crypto_expand_key_material_TAP(const uint8_t *key_in, size_t key_in_len, for (cp = key_out, i=0; cp < key_out+key_out_len; ++i, cp += DIGEST_LEN) { tmp[key_in_len] = i; - if (crypto_digest((char*)digest, (const char *)tmp, key_in_len+1)) + if (crypto_digest((char*)digest, (const char *)tmp, key_in_len+1) < 0) goto exit; memcpy(cp, digest, MIN(DIGEST_LEN, key_out_len-(cp-key_out))); } diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8ffd0bc..4d25251 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3084,7 +3084,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) len += 2; memcpy(auth, circuit->cpath->prev->rend_circ_nonce, DIGEST_LEN); memcpy(auth+DIGEST_LEN, "INTRODUCE", 9); - if (crypto_digest(buf+len, auth, DIGEST_LEN+9)) + if (crypto_digest(buf+len, auth, DIGEST_LEN+9) < 0) goto err; len += 20; note_crypto_pk_op(REND_SERVER); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2cfd3fc..8f8d2b8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4536,7 +4536,7 @@ router_get_hash_impl(const char *s, size_t s_len, char *digest, return -1;
if (alg == DIGEST_SHA1) { - if (crypto_digest(digest, start, end-start)) { + if (crypto_digest(digest, start, end-start) < 0) { log_warn(LD_BUG,"couldn't compute digest"); return -1; }