diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-14 18:00:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-14 18:00:38 -0400 |
| commit | 149931571a4c5ad9ec24eb6d4306e8965a454211 (patch) | |
| tree | cf2b4d83a7a5028526e19cf3f3641d813d9c06ba /src/or/networkstatus.c | |
| parent | 47f7085de7a496b6bfa79de9e1b22ca4a28b0f27 (diff) | |
| parent | 75b4975d7722d9497847fdab8dcfb2ac10f58fdb (diff) | |
| download | tor-149931571a4c5ad9ec24eb6d4306e8965a454211.tar tor-149931571a4c5ad9ec24eb6d4306e8965a454211.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/routerlist.h
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 1b5c6dbb3..23b7304b3 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -436,6 +436,17 @@ networkstatus_check_document_signature(const networkstatus_t *consensus, DIGEST_LEN)) return -1; + if (authority_cert_is_blacklisted(cert)) { + /* We implement blacklisting for authority signing keys by treating + * all their signatures as always bad. That way we don't get into + * crazy loops of dropping and re-fetching signatures. */ + log_warn(LD_DIR, "Ignoring a consensus signature made with deprecated" + " signing key %s", + hex_str(cert->signing_key_digest, DIGEST_LEN)); + sig->bad_signature = 1; + return 0; + } + signed_digest_len = crypto_pk_keysize(cert->signing_key); signed_digest = tor_malloc(signed_digest_len); if (crypto_pk_public_checksig(cert->signing_key, |