aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-17 20:04:16 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-17 20:04:16 -0400
commitab932cd7bfb7e4cfe9c33416ca45e56448c57b58 (patch)
tree47239632cadcff44aac214be557a54ac64dc2e13 /src/or/routerparse.c
parent3f49474349538be499ab485c697c147c8829fa0d (diff)
downloadtor-ab932cd7bfb7e4cfe9c33416ca45e56448c57b58.tar.gz
tor-ab932cd7bfb7e4cfe9c33416ca45e56448c57b58.zip
Remove duplicate siging_key_cert fields.
With the fix for #17150, I added a duplicate certificate here. Here I remove the original location in 0.2.8. (I wouldn't want to do that in 027, due to the amount of authority-voting-related code drift.) Closes 19073.
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index b108dd71a1..a7c29aa869 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1,4 +1,4 @@
- /* Copyright (c) 2001 Matej Pfajfar.
+/* Copyright (c) 2001 Matej Pfajfar.
* Copyright (c) 2001-2004, Roger Dingledine.
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
* Copyright (c) 2007-2016, The Tor Project, Inc. */
@@ -1405,8 +1405,7 @@ router_parse_entry_from_string(const char *s, const char *end,
log_warn(LD_DIR, "Couldn't parse ed25519 cert");
goto err;
}
- router->signing_key_cert = cert; /* makes sure it gets freed. */
- router->cache_info.signing_key_cert = tor_cert_dup(cert);
+ router->cache_info.signing_key_cert = cert; /* makes sure it gets freed.*/
if (cert->cert_type != CERT_TYPE_ID_SIGNING ||
! cert->signing_key_included) {
@@ -1787,8 +1786,9 @@ extrainfo_parse_entry_from_string(const char *s, const char *end,
log_warn(LD_DIR, "Couldn't parse ed25519 cert");
goto err;
}
- extrainfo->signing_key_cert = cert; /* makes sure it gets freed. */
- extrainfo->cache_info.signing_key_cert = tor_cert_dup(cert);
+ /* makes sure it gets freed. */
+ extrainfo->cache_info.signing_key_cert = cert;
+
if (cert->cert_type != CERT_TYPE_ID_SIGNING ||
! cert->signing_key_included) {
log_warn(LD_DIR, "Invalid form for ed25519 cert");