diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
| commit | 3fa9151f2610fdad23df02b2b914881286b22480 (patch) | |
| tree | ef9f91dfb3c886a59cc591739dc7ddb6f8a703a5 /src/test/test_crypto.c | |
| parent | cd4f56a37c3513cdca3463c3638067380af29219 (diff) | |
| parent | 4458fd0cd8fa259f0ee8195e1aa86d5b7c6f8919 (diff) | |
| download | tor-3fa9151f2610fdad23df02b2b914881286b22480.tar.gz tor-3fa9151f2610fdad23df02b2b914881286b22480.zip | |
Merge branch 'win64-7260'
Conflicts:
src/or/dns.c
Diffstat (limited to 'src/test/test_crypto.c')
| -rw-r--r-- | src/test/test_crypto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index fd983de002..ed1da39670 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -119,9 +119,9 @@ test_crypto_aes(void *arg) memset(data2, 0, 1024); memset(data3, 0, 1024); env1 = crypto_cipher_new(NULL); - test_neq(env1, 0); + test_neq_ptr(env1, 0); env2 = crypto_cipher_new(crypto_cipher_get_key(env1)); - test_neq(env2, 0); + test_neq_ptr(env2, 0); /* Try encrypting 512 chars. */ crypto_cipher_encrypt(env1, data2, data1, 512); @@ -152,7 +152,7 @@ test_crypto_aes(void *arg) memset(data3, 0, 1024); env2 = crypto_cipher_new(crypto_cipher_get_key(env1)); - test_neq(env2, 0); + test_neq_ptr(env2, NULL); for (j = 0; j < 1024-16; j += 17) { crypto_cipher_encrypt(env2, data3+j, data1+j, 17); } |