aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-05-28 10:47:42 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-28 10:47:47 -0400
commit3bee74c6d115131f4850a07a5c12db21ae6f3193 (patch)
treedd261f2ef2007364c54043af54bd6aea9c300adb /src/or/main.c
parent32f59d73372f5843ceb305a9d58387573d90f4f6 (diff)
downloadtor-3bee74c6d115131f4850a07a5c12db21ae6f3193.tar.gz
tor-3bee74c6d115131f4850a07a5c12db21ae6f3193.zip
Generate weird certificates correctly
(Our link protocol assumes that the link cert certifies the TLS key, and there is an RSA->Ed25519 crosscert)
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index c4b5af4ab4..4fac17a59c 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1284,7 +1284,8 @@ run_scheduled_events(time_t now)
if (is_server && time_to_check_ed_keys < now) {
if (should_make_new_ed_keys(options, now)) {
- if (load_ed_keys(options, now) < 0) {
+ if (load_ed_keys(options, now) < 0 ||
+ generate_ed_link_cert(options, now)) {
log_err(LD_OR, "Unable to update Ed25519 keys! Exiting.");
tor_cleanup();
exit(0);