diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-08-25 11:39:38 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-08-25 11:39:38 -0400 |
commit | b91dce9454c3db669a07968b25a4fa03d8526917 (patch) | |
tree | d1e4aa46835978b63628a1dbd3e5782140cb72fa /src/or/routerparse.c | |
parent | 0de3147bf1b7a76b99ced69bde6e2169bb9a0caa (diff) | |
parent | 6069c829f90576c04a0802d2a108378a2bbabb7a (diff) | |
download | tor-b91dce9454c3db669a07968b25a4fa03d8526917.tar.gz tor-b91dce9454c3db669a07968b25a4fa03d8526917.zip |
Merge branch 'maint-0.3.1'
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r-- | src/or/routerparse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 3449e6f6b5..9c11f4d07f 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5297,7 +5297,10 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, "v2 rendezvous service descriptor") < 0) goto err; /* Verify that descriptor ID belongs to public key and secret ID part. */ - crypto_pk_get_digest(result->pk, public_key_hash); + if (crypto_pk_get_digest(result->pk, public_key_hash) < 0) { + log_warn(LD_REND, "Unable to compute rend descriptor public key digest"); + goto err; + } rend_get_descriptor_id_bytes(test_desc_id, public_key_hash, secret_id_part); if (tor_memneq(desc_id_out, test_desc_id, DIGEST_LEN)) { |