diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-13 12:44:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-13 12:45:18 -0400 |
| commit | 5000e59b5ff4234c6119c5ac0e9f419430c8b699 (patch) | |
| tree | caea7bf92091e46da7f39abc9c976e3633bdb086 | |
| parent | 3ab09763ced6d892cd72956e53f2dfb804ec0a7c (diff) | |
| download | tor-5000e59b5ff4234c6119c5ac0e9f419430c8b699.tar.gz tor-5000e59b5ff4234c6119c5ac0e9f419430c8b699.zip | |
Change GETINFO fingerprint to look at server_mode, not my_descriptor
It's possible for us to be a server and have a fingerprint without
having yet generated a descriptor.
Fixes bug 3577; bugfix on 0.2.0.1-alpha
| -rw-r--r-- | changes/bug3577 | 4 | ||||
| -rw-r--r-- | src/or/control.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/changes/bug3577 b/changes/bug3577 new file mode 100644 index 0000000000..6335272752 --- /dev/null +++ b/changes/bug3577 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Allow GETINFO fingerprint to return a fingerprint even when + we have not yet built a router descriptor. Fixes bug 3577; + bugfix on 0.2.0.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index da0a95da15..d33d33734e 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1394,14 +1394,14 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "dir-usage")) { *answer = directory_dump_request_log(); } else if (!strcmp(question, "fingerprint")) { - routerinfo_t *me = router_get_my_routerinfo(); - if (!me) { + crypto_pk_env_t *server_key; + if (!server_mode(get_options())) { *errmsg = "No routerdesc known; am I really a server?"; return -1; } + server_key = get_server_identity_key(); *answer = tor_malloc(HEX_DIGEST_LEN+1); - base16_encode(*answer, HEX_DIGEST_LEN+1, me->cache_info.identity_digest, - DIGEST_LEN); + crypto_pk_get_fingerprint(server_key, *answer, 0); } return 0; } |