summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-17 19:47:48 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-17 19:47:48 -0400
commite0e8424f1eaf88f1c03a0acbfe09d368d3cbb1be (patch)
tree1bb633f98ef832cf555386118d4115de9fd24ffc /src/or/routerparse.c
parent4082d67b03075712707d76b960c6525d00c1c0c0 (diff)
parent21ed575826e701437f7893536ffc5c8d2a71532f (diff)
downloadtor-e0e8424f1eaf88f1c03a0acbfe09d368d3cbb1be.tar.gz
tor-e0e8424f1eaf88f1c03a0acbfe09d368d3cbb1be.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index dcfb6f86b2..295b74dc2d 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -4345,6 +4345,11 @@ microdescs_parse_from_string(const char *s, const char *eos,
}
tok = find_by_keyword(tokens, K_ONION_KEY);
+ if (!crypto_pk_public_exponent_ok(tok->key)) {
+ log_warn(LD_DIR,
+ "Relay's onion key had invalid exponent.");
+ goto next;
+ }
md->onion_pkey = tok->key;
tok->key = NULL;