From 3bee74c6d115131f4850a07a5c12db21ae6f3193 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 May 2015 10:47:42 -0400
Subject: Generate weird certificates correctly

(Our link protocol assumes that the link cert certifies the TLS key,
and there is an RSA->Ed25519 crosscert)
---
 src/or/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/or/main.c')

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);
-- 
cgit v1.2.3-54-g00ecf