summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-07-21 18:20:09 +0000
committerRoger Dingledine <arma@torproject.org>2004-07-21 18:20:09 +0000
commit1e62d24ddc3e28fed81739f0184fe8cf3a2ee51e (patch)
tree9390d0f36dc14e8cff8ef87cc0899d5118be6c12
parentc83f0e948f1ae3eccd55f74a15f8b33749a8b283 (diff)
downloadtor-1e62d24ddc3e28fed81739f0184fe8cf3a2ee51e.tar.gz
tor-1e62d24ddc3e28fed81739f0184fe8cf3a2ee51e.zip
bugfix: only require the correct key if the nickname is for
a verified router svn:r2084
-rw-r--r--src/or/connection_or.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index bf9975d95e..4c07f1bec0 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -309,7 +309,8 @@ connection_tls_finish_handshake(connection_t *conn) {
crypto_free_pk_env(identity_rcvd);
router = router_get_by_nickname(nickname);
- if(router && /* we know this nickname; make sure it's the right guy */
+ if(router && /* we know this nickname */
+ router->is_verified && /* make sure it's the right guy */
memcmp(digest_rcvd, router->identity_digest, DIGEST_LEN) != 0) {
log_fn(LOG_WARN, "Identity key not as expected for %s", nickname);
return -1;