diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 19:47:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 19:47:22 -0400 |
| commit | 3f49474349538be499ab485c697c147c8829fa0d (patch) | |
| tree | 060784f765cd523151958a0c0ef34064f17ee407 /src/or/routerparse.c | |
| parent | d6a2fec05ebcc39773a2f6666e1378410c64f047 (diff) | |
| parent | 00f74e0372a956f9db590e1cb2ddcfb265125023 (diff) | |
| download | tor-3f49474349538be499ab485c697c147c8829fa0d.tar.gz tor-3f49474349538be499ab485c697c147c8829fa0d.zip | |
Merge branch 'bug17150_027_extra' into maint-0.2.8
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index cec10c8f24..b108dd71a1 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1406,6 +1406,7 @@ router_parse_entry_from_string(const char *s, const char *end, goto err; } router->signing_key_cert = cert; /* makes sure it gets freed. */ + router->cache_info.signing_key_cert = tor_cert_dup(cert); if (cert->cert_type != CERT_TYPE_ID_SIGNING || ! cert->signing_key_included) { @@ -1600,7 +1601,7 @@ router_parse_entry_from_string(const char *s, const char *end, } if (tok->n_args >= 2) { - if (digest256_from_base64(router->extra_info_digest256, tok->args[1]) + if (digest256_from_base64(router->cache_info.extra_info_digest256, tok->args[1]) < 0) { log_warn(LD_DIR, "Invalid extra info digest256 %s", escaped(tok->args[1])); @@ -1787,6 +1788,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, goto err; } extrainfo->signing_key_cert = cert; /* makes sure it gets freed. */ + extrainfo->cache_info.signing_key_cert = tor_cert_dup(cert); if (cert->cert_type != CERT_TYPE_ID_SIGNING || ! cert->signing_key_included) { log_warn(LD_DIR, "Invalid form for ed25519 cert"); |