diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-27 12:12:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-27 12:12:16 -0400 |
| commit | 0793ef862b4991281bcb9155f0d15a3930889bea (patch) | |
| tree | 968bc0b205e3afa86de57cb6288252605f95563c /src/test/test_dir.c | |
| parent | 682c154cc49a4219ee9828cb9b0cc4339102cbc5 (diff) | |
| parent | 909aa51b3f4411b30bccbbf1dd9f876d150167fd (diff) | |
| download | tor-0793ef862b4991281bcb9155f0d15a3930889bea.tar.gz tor-0793ef862b4991281bcb9155f0d15a3930889bea.zip | |
Merge remote-tracking branch 'sebastian/bug13286'
Diffstat (limited to 'src/test/test_dir.c')
| -rw-r--r-- | src/test/test_dir.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index e03efbeff5..d17f0b7921 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -216,10 +216,8 @@ test_dir_formats(void *arg) strlcat(buf2, "signing-key\n", sizeof(buf2)); strlcat(buf2, pk1_str, sizeof(buf2)); strlcat(buf2, "hidden-service-dir\n", sizeof(buf2)); -#ifdef CURVE25519_ENABLED strlcat(buf2, "ntor-onion-key " "skyinAnvardNostarsNomoonNowindormistsorsnow=\n", sizeof(buf2)); -#endif strlcat(buf2, "accept *:80\nreject 18.0.0.0/8:24\n", sizeof(buf2)); strlcat(buf2, "router-signature\n", sizeof(buf2)); @@ -239,11 +237,9 @@ test_dir_formats(void *arg) tt_int_op(rp2->bandwidthrate,==, r2->bandwidthrate); tt_int_op(rp2->bandwidthburst,==, r2->bandwidthburst); tt_int_op(rp2->bandwidthcapacity,==, r2->bandwidthcapacity); -#ifdef CURVE25519_ENABLED tt_mem_op(rp2->onion_curve25519_pkey->public_key,==, r2->onion_curve25519_pkey->public_key, CURVE25519_PUBKEY_LEN); -#endif tt_assert(crypto_pk_cmp_keys(rp2->onion_pkey, pk2) == 0); tt_assert(crypto_pk_cmp_keys(rp2->identity_pkey, pk1) == 0); |