diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:52:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:52:06 -0400 |
| commit | e3b1573be6aefc91946fa4649591ed1690d77ee8 (patch) | |
| tree | 449e6a0f317b7ce73a18b3c34477f474247f074f /src/or/router.c | |
| parent | dd573f72b2f20b9aec310ee298ac4e9b737f835d (diff) | |
| parent | 91f49bc0f0759d0e0a794fbfe8cce5a9bb07e607 (diff) | |
| download | tor-e3b1573be6aefc91946fa4649591ed1690d77ee8.tar.gz tor-e3b1573be6aefc91946fa4649591ed1690d77ee8.zip | |
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 9b4c2445f4..2187a76b48 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -986,7 +986,8 @@ init_keys(void) } /* 1d. Load all ed25519 keys */ - if (load_ed_keys(options,now) < 0) + const int new_signing_key = load_ed_keys(options,now); + if (new_signing_key < 0) return -1; /* 2. Read onion key. Make it if none is found. */ @@ -1056,7 +1057,7 @@ init_keys(void) /* 3b. Get an ed25519 link certificate. Note that we need to do this * after we set up the TLS context */ - if (generate_ed_link_cert(options, now) < 0) { + if (generate_ed_link_cert(options, now, new_signing_key > 0) < 0) { log_err(LD_GENERAL,"Couldn't make link cert"); return -1; } |