diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 13:25:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 13:25:13 -0500 |
| commit | 1393985768d760e11e45faabb537d28248306e8b (patch) | |
| tree | 61b35b3b734f8a920a08cc9a9ecb70e408cd4a58 /src/test | |
| parent | 9d133464c874191414dd51f546d09364419040cf (diff) | |
| parent | b97b0efec81c5564999c2545dd7f0ca230b239cc (diff) | |
| download | tor-1393985768d760e11e45faabb537d28248306e8b.tar.gz tor-1393985768d760e11e45faabb537d28248306e8b.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/routerparse.c
src/or/test.c
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index c7c5a0b72b..e61815027c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -745,11 +745,11 @@ test_dir_v3_networkstatus(void) sign_skey_leg1 = pk_generate(4); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_1, - AUTHORITY_SIGNKEY_1)); + AUTHORITY_SIGNKEY_1, -1)); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_2, - AUTHORITY_SIGNKEY_2)); + AUTHORITY_SIGNKEY_2, -1)); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_3, - AUTHORITY_SIGNKEY_3)); + AUTHORITY_SIGNKEY_3, -1)); test_assert(!crypto_pk_cmp_keys(sign_skey_1, cert1->signing_key)); test_assert(!crypto_pk_cmp_keys(sign_skey_2, cert2->signing_key)); |