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/test | |
| parent | a7a44f2db0b6732ed53a24186dc09eea50296a20 (diff) | |
| parent | 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 (diff) | |
| download | tor-4a14c2cfc7972db39da4fd3a72cfd64d036daf7b.tar.gz tor-4a14c2cfc7972db39da4fd3a72cfd64d036daf7b.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_dir.c | 9 | ||||
| -rw-r--r-- | src/test/test_microdesc.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 18c584f01d..bddbe9f18e 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -160,15 +160,15 @@ test_dir_formats(void *arg) ed25519_secret_key_from_seed(&kp2.seckey, (const uint8_t*)"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); ed25519_public_key_generate(&kp2.pubkey, &kp2.seckey); - r2->signing_key_cert = tor_cert_create(&kp1, + r2->cache_info.signing_key_cert = tor_cert_create(&kp1, CERT_TYPE_ID_SIGNING, &kp2.pubkey, now, 86400, CERT_FLAG_INCLUDE_SIGNING_KEY); char cert_buf[256]; base64_encode(cert_buf, sizeof(cert_buf), - (const char*)r2->signing_key_cert->encoded, - r2->signing_key_cert->encoded_len, + (const char*)r2->cache_info.signing_key_cert->encoded, + r2->cache_info.signing_key_cert->encoded_len, BASE64_ENCODE_MULTILINE); r2->platform = tor_strdup(platform); r2->cache_info.published_on = 5; @@ -279,7 +279,8 @@ test_dir_formats(void *arg) strlcat(buf2, "master-key-ed25519 ", sizeof(buf2)); { char k[ED25519_BASE64_LEN+1]; - tt_assert(ed25519_public_to_base64(k, &r2->signing_key_cert->signing_key) + tt_assert(ed25519_public_to_base64(k, + &r2->cache_info.signing_key_cert->signing_key) >= 0); strlcat(buf2, k, sizeof(buf2)); strlcat(buf2, "\n", sizeof(buf2)); diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 7db819a622..581f58b45f 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -483,7 +483,7 @@ test_md_generate(void *arg) md = dirvote_create_microdescriptor(ri, 21); tt_str_op(md->body, ==, test_md2_21); tt_assert(ed25519_pubkey_eq(md->ed25519_identity_pkey, - &ri->signing_key_cert->signing_key)); + &ri->cache_info.signing_key_cert->signing_key)); done: microdesc_free(md); |