diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:02:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:02:55 -0500 |
| commit | ed87738ede789fb9eccfd2e5a34bd8c484dfe44e (patch) | |
| tree | 27eb5efade75d368692a80d258615415deb8a7dc /src/or/routerlist.c | |
| parent | b27f5cc50d4a66bff31e43a596eb296a1b5a11dc (diff) | |
| parent | 50b06a2b76190170e9f80739f022696755b54b99 (diff) | |
| download | tor-ed87738ede789fb9eccfd2e5a34bd8c484dfe44e.tar.gz tor-ed87738ede789fb9eccfd2e5a34bd8c484dfe44e.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/config.c
src/or/networkstatus.c
src/or/rendcommon.c
src/or/routerparse.c
src/or/test.c
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 253b787217..e29b4c49d8 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5016,7 +5016,8 @@ routerinfo_incompatible_with_extrainfo(routerinfo_t *ri, extrainfo_t *ei, if (ei->pending_sig) { char signed_digest[128]; - if (crypto_pk_public_checksig(ri->identity_pkey, signed_digest, + if (crypto_pk_public_checksig(ri->identity_pkey, + signed_digest, sizeof(signed_digest), ei->pending_sig, ei->pending_sig_len) != DIGEST_LEN || memcmp(signed_digest, ei->cache_info.signed_descriptor_digest, DIGEST_LEN)) { |