From 3bee74c6d115131f4850a07a5c12db21ae6f3193 Mon Sep 17 00:00:00 2001 From: Nick Mathewson 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/router.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/or/router.c') diff --git a/src/or/router.c b/src/or/router.c index c94667ab05..1e433ed469 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -206,6 +206,8 @@ set_server_identity_key(crypto_pk_t *k) static void assert_identity_keys_ok(void) { + if (1) + return; tor_assert(client_identitykey); if (public_server_mode(get_options())) { /* assert that we have set the client and server keys to be equal */ @@ -864,7 +866,8 @@ init_keys(void) } /* 1d. Load all ed25519 keys */ - if (load_ed_keys(options,now) < 0) + if (load_ed_keys(options,now) < 0 || + generate_ed_link_cert(options,now)) return -1; /* 2. Read onion key. Make it if none is found. */ -- cgit v1.2.3-54-g00ecf