diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-25 11:38:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-25 11:38:24 -0400 |
| commit | 6069c829f90576c04a0802d2a108378a2bbabb7a (patch) | |
| tree | aaaf670a9e79384e0d83f5b8a04738636fef9566 /src/or/routerparse.c | |
| parent | 10b242822490c9873138565bcc8a3565a7dc7014 (diff) | |
| parent | 418f3d6298beb27e050618e2f59e01d6d3b2f45b (diff) | |
| download | tor-6069c829f90576c04a0802d2a108378a2bbabb7a.tar.gz tor-6069c829f90576c04a0802d2a108378a2bbabb7a.zip | |
Merge branch 'bug19418_029' into 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 0f6113ccfc..22521a3069 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5293,7 +5293,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)) { |