diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:25:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:25:12 -0500 |
| commit | 882e0fbd76b9b56b943680a310d16fc94ab07438 (patch) | |
| tree | d738366734ac1ae1f523fd1343064c4b93af36d6 /src/test/test_dir.c | |
| parent | b3534dfc5e85c82e915c1576a8a58500fdd7c878 (diff) | |
| parent | e202f3a1ca2d2ef87820d0ff618a37d76b4e702a (diff) | |
| download | tor-882e0fbd76b9b56b943680a310d16fc94ab07438.tar.gz tor-882e0fbd76b9b56b943680a310d16fc94ab07438.zip | |
Merge branch 'bug17795'
Diffstat (limited to 'src/test/test_dir.c')
| -rw-r--r-- | src/test/test_dir.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 83a8b8ccc6..72e619f9cd 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1999,11 +1999,13 @@ test_a_networkstatus( tt_assert(con_md3); /* All three should have the same digest. */ - tt_mem_op(&con->digests,OP_EQ, &con2->digests, sizeof(digests_t)); - tt_mem_op(&con->digests,OP_EQ, &con3->digests, sizeof(digests_t)); + tt_mem_op(&con->digests,OP_EQ, &con2->digests, sizeof(common_digests_t)); + tt_mem_op(&con->digests,OP_EQ, &con3->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, sizeof(digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, sizeof(digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, + sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, + sizeof(common_digests_t)); /* Extract a detached signature from con3. */ detached_text1 = get_detached_sigs(con3, con_md3); @@ -2017,7 +2019,7 @@ test_a_networkstatus( tt_int_op(dsig1->fresh_until,OP_EQ, con3->fresh_until); tt_int_op(dsig1->valid_until,OP_EQ, con3->valid_until); { - digests_t *dsig_digests = strmap_get(dsig1->digests, "ns"); + common_digests_t *dsig_digests = strmap_get(dsig1->digests, "ns"); tt_assert(dsig_digests); tt_mem_op(dsig_digests->d[DIGEST_SHA1], OP_EQ, con3->digests.d[DIGEST_SHA1], DIGEST_LEN); |