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/dirvote.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/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 4c64cc9c39..6a02fca69e 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3529,10 +3529,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); |