diff options
author | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
commit | 887eba98950f2974bd2031510e1ece2279a4f106 (patch) | |
tree | 0bda88092333a1aa21925033596f395df4e3d4b1 /src/test/test_crypto.c | |
parent | fcd9248387249d68619734a73860ffaab12b021b (diff) | |
parent | 6acf0ac2851fb95953edea9c231d82f487f28c3d (diff) | |
download | tor-887eba98950f2974bd2031510e1ece2279a4f106.tar.gz tor-887eba98950f2974bd2031510e1ece2279a4f106.zip |
Merge branch 'maint-0.2.4' into release-0.2.4
Diffstat (limited to 'src/test/test_crypto.c')
-rw-r--r-- | src/test/test_crypto.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index afb338a69c..fcaa0813e7 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -636,22 +636,6 @@ test_crypto_formats(void) tor_free(data2); } - /* Check fingerprint */ - { - test_assert(crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 0000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 00000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD1234 ABCD 5678 0000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD1234 ABCD 5678 00000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ACD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 00000")); - } - done: tor_free(data1); tor_free(data2); @@ -1113,7 +1097,7 @@ test_crypto_curve25519_persist(void *arg) tor_free(tag); content[69] ^= 0xff; - tt_int_op(0, ==, write_bytes_to_file(fname, content, st.st_size, 1)); + tt_int_op(0, ==, write_bytes_to_file(fname, content, (size_t)st.st_size, 1)); tt_int_op(-1, ==, curve25519_keypair_read_from_file(&keypair2, &tag, fname)); done: |