diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:11:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:11:02 -0400 |
| commit | 1587735c90f62799e34bc30b1a99eaef6b67dbaa (patch) | |
| tree | 5e9eb59ace957248248210db49fa5d654b30b4f8 /src/or/dirserv.c | |
| parent | 5f3010667d9473d5c246ff77d6dc3d0ad4c4f30a (diff) | |
| parent | 03adb8caadb894a7fcd7c7a24e3147fa6d3fc4f9 (diff) | |
| download | tor-1587735c90f62799e34bc30b1a99eaef6b67dbaa.tar.gz tor-1587735c90f62799e34bc30b1a99eaef6b67dbaa.zip | |
Merge branch 'bug988-nm' into maint-0.2.2
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8d0ec981a7..42d7d561ce 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1552,7 +1552,8 @@ dirserv_regenerate_directory(void) { char *new_directory=NULL; - if (dirserv_dump_directory_to_string(&new_directory, get_identity_key())) { + if (dirserv_dump_directory_to_string(&new_directory, + get_server_identity_key())) { log_warn(LD_BUG, "Error creating directory."); tor_free(new_directory); return NULL; @@ -1582,7 +1583,7 @@ generate_runningrouters(void) char digest[DIGEST_LEN]; char published[ISO_TIME_LEN+1]; size_t len; - crypto_pk_env_t *private_key = get_identity_key(); + crypto_pk_env_t *private_key = get_server_identity_key(); char *identity_pkey; /* Identity key, DER64-encoded. */ size_t identity_pkey_len; @@ -2710,7 +2711,7 @@ generate_v2_networkstatus_opinion(void) smartlist_t *routers = NULL; digestmap_t *omit_as_sybil = NULL; - private_key = get_identity_key(); + private_key = get_server_identity_key(); if (resolve_my_address(LOG_WARN, options, &addr, &hostname)<0) { log_warn(LD_NET, "Couldn't resolve my hostname"); |