aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirvote.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-04 23:29:56 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-04 23:29:56 -0400
commit08efa70c41b258d8655ec01bdb721aea96b42d46 (patch)
tree3f02d0f047881c9f79591df82890db087f986793 /src/or/dirvote.c
parent7de3a19497f081e680e7fd35315f107510f313ad (diff)
parent9583a534ac8801211b6c171c399f1ea6bb3cce1c (diff)
downloadtor-08efa70c41b258d8655ec01bdb721aea96b42d46.tar
tor-08efa70c41b258d8655ec01bdb721aea96b42d46.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/dirvote.c')
-rw-r--r--src/or/dirvote.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 7ba6cca1b..b90684c39 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -3122,8 +3122,12 @@ dirvote_compute_consensuses(void)
authority_cert_t *cert = get_my_v3_legacy_cert();
legacy_sign = get_my_v3_legacy_signing_key();
if (cert) {
- crypto_pk_get_digest(cert->identity_key, legacy_dbuf);
- legacy_id_digest = legacy_dbuf;
+ if (crypto_pk_get_digest(cert->identity_key, legacy_dbuf)) {
+ log_warn(LD_BUG,
+ "Unable to compute digest of legacy v3 identity key");
+ } else {
+ legacy_id_digest = legacy_dbuf;
+ }
}
}