Commit 866a2828 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'bug3577' into maint-0.2.2

parents 5580fbb0 2e34416c

changes/bug3577

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/or/control.c

+5 −5
Original line number Diff line number Diff line
@@ -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) {

      *errmsg = "No routerdesc known; am I really a server?";

    crypto_pk_env_t *server_key;

    if (!server_mode(get_options())) {

      *errmsg = "Not running in server mode";

      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;

}