diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:23:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:23:01 -0400 |
| commit | 17fdde3d9251e92f01be839efe7fc7cac4854484 (patch) | |
| tree | f22d97b3a46d499dc40c9b958afa1e634909ea55 /src/or/dirserv.c | |
| parent | f3eb2a10ae432eb0907418ff69b5e9535b3c7970 (diff) | |
| parent | 441241c13692051ff1b4ae86eaf472a8782cd5d6 (diff) | |
| download | tor-17fdde3d9251e92f01be839efe7fc7cac4854484.tar.gz tor-17fdde3d9251e92f01be839efe7fc7cac4854484.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/common/tortls.c
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 31b198f2b5..4f793dc746 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1578,7 +1578,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; @@ -1608,7 +1609,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; @@ -2734,7 +2735,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"); |