diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:39 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:39 -0400 |
commit | 4a14c2cfc7972db39da4fd3a72cfd64d036daf7b (patch) | |
tree | df7812c9ea3ea51bb66ab93fa7fc10a593cf020c /src/or/routerlist.c | |
parent | a7a44f2db0b6732ed53a24186dc09eea50296a20 (diff) | |
parent | 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 (diff) | |
download | tor-4a14c2cfc7972db39da4fd3a72cfd64d036daf7b.tar.gz tor-4a14c2cfc7972db39da4fd3a72cfd64d036daf7b.zip |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r-- | src/or/routerlist.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 62a8e9b030..98e505653d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2953,7 +2953,6 @@ routerinfo_free(routerinfo_t *router) tor_free(router->onion_curve25519_pkey); if (router->identity_pkey) crypto_pk_free(router->identity_pkey); - tor_cert_free(router->signing_key_cert); tor_cert_free(router->cache_info.signing_key_cert); if (router->declared_family) { SMARTLIST_FOREACH(router->declared_family, char *, s, tor_free(s)); @@ -2973,7 +2972,6 @@ extrainfo_free(extrainfo_t *extrainfo) { if (!extrainfo) return; - tor_cert_free(extrainfo->signing_key_cert); tor_cert_free(extrainfo->cache_info.signing_key_cert); tor_free(extrainfo->cache_info.signed_descriptor_body); tor_free(extrainfo->pending_sig); @@ -5273,7 +5271,8 @@ routerinfo_incompatible_with_extrainfo(const crypto_pk_t *identity_pkey, goto err; /* different servers */ } - if (! tor_cert_opt_eq(sd->signing_key_cert, ei->signing_key_cert)) { + if (! tor_cert_opt_eq(sd->signing_key_cert, + ei->cache_info.signing_key_cert)) { if (msg) *msg = "Extrainfo signing key cert didn't match routerinfo"; goto err; /* different servers */ } |