diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 15:56:31 -0400 |
| commit | 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 (patch) | |
| tree | 2468f0cea8949fe07e1279f06788c814907e4e43 /src/or/dirvote.c | |
| parent | dd17df2253fb0592ed3f75f8cf5134b71800df62 (diff) | |
| parent | 2729f166cb715f0f4aff8779f0fadebafc56a70c (diff) | |
| download | tor-0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3.tar.gz tor-0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3.zip | |
Merge remote-tracking branch 'public/bug19073' into maint-0.2.8
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); |