diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:16:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:16:54 -0400 |
| commit | b1b6552251c87db6c4fd226add8ae8bdb9327981 (patch) | |
| tree | 0596fbac288b6770396d18e777981c687f6dd3db /src/test/test_dir.c | |
| parent | 57b954293e3880f3b39d2f0f0f7710250e8ffc5f (diff) | |
| parent | cf399f1034cec6be2b7a98cb82a8607634e120f6 (diff) | |
| download | tor-b1b6552251c87db6c4fd226add8ae8bdb9327981.tar.gz tor-b1b6552251c87db6c4fd226add8ae8bdb9327981.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/crypto.c
Diffstat (limited to 'src/test/test_dir.c')
| -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 161eda9cd7..4b86be4963 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -748,11 +748,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, -1)); + AUTHORITY_SIGNKEY_1, -1)); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_2, - AUTHORITY_SIGNKEY_2, -1)); + AUTHORITY_SIGNKEY_2, -1)); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_3, - AUTHORITY_SIGNKEY_3, -1)); + 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)); |