diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 20:04:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 20:04:16 -0400 |
commit | ab932cd7bfb7e4cfe9c33416ca45e56448c57b58 (patch) | |
tree | 47239632cadcff44aac214be557a54ac64dc2e13 /src/or/dirvote.c | |
parent | 3f49474349538be499ab485c697c147c8829fa0d (diff) | |
download | tor-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/dirvote.c')
-rw-r--r-- | src/or/dirvote.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9854af7d7f..62f85877fe 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3528,10 +3528,11 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) char idbuf[ED25519_BASE64_LEN+1]; const char *keytype; if (consensus_method >= MIN_METHOD_FOR_ED25519_ID_IN_MD && - ri->signing_key_cert && - ri->signing_key_cert->signing_key_included) { + ri->cache_info.signing_key_cert && + ri->cache_info.signing_key_cert->signing_key_included) { keytype = "ed25519"; - ed25519_public_to_base64(idbuf, &ri->signing_key_cert->signing_key); + ed25519_public_to_base64(idbuf, + &ri->cache_info.signing_key_cert->signing_key); } else { keytype = "rsa1024"; digest_to_base64(idbuf, ri->cache_info.identity_digest); |