diff options
| author | Martin Willi <martin@revosec.ch> | 2012-07-09 15:33:41 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-07-16 14:55:06 +0200 |
| commit | 8bd6a30af1b745f65f60130d4735df05096e07ce (patch) | |
| tree | 8834701cea8764fb47281ea533096ec5dcc20b81 /src/libstrongswan/crypto/crypto_tester.c | |
| parent | ce73fc19dbc36d089e595e452356deccd8afcd6f (diff) | |
| download | strongswan-8bd6a30af1b745f65f60130d4735df05096e07ce.tar.bz2 strongswan-8bd6a30af1b745f65f60130d4735df05096e07ce.tar.xz | |
Add a return value to hasher_t.get_hash()
Diffstat (limited to 'src/libstrongswan/crypto/crypto_tester.c')
| -rw-r--r-- | src/libstrongswan/crypto/crypto_tester.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/libstrongswan/crypto/crypto_tester.c b/src/libstrongswan/crypto/crypto_tester.c index 4e5e840b5..f422a2c19 100644 --- a/src/libstrongswan/crypto/crypto_tester.c +++ b/src/libstrongswan/crypto/crypto_tester.c @@ -688,8 +688,10 @@ static u_int bench_hasher(private_crypto_tester_t *this, start_timing(&start); while (end_timing(&start) < this->bench_time) { - hasher->get_hash(hasher, buf, hash); - runs++; + if (hasher->get_hash(hasher, buf, hash)) + { + runs++; + } } free(buf.ptr); hasher->destroy(hasher); @@ -744,7 +746,10 @@ METHOD(crypto_tester_t, test_hasher, bool, } /* hash to existing buffer */ memset(hash.ptr, 0, hash.len); - hasher->get_hash(hasher, data, hash.ptr); + if (!hasher->get_hash(hasher, data, hash.ptr)) + { + failed = TRUE; + } if (!memeq(vector->hash, hash.ptr, hash.len)) { failed = TRUE; @@ -754,9 +759,9 @@ METHOD(crypto_tester_t, test_hasher, bool, { memset(hash.ptr, 0, hash.len); hasher->allocate_hash(hasher, chunk_create(data.ptr, 1), NULL); - hasher->get_hash(hasher, chunk_create(data.ptr + 1, 1), NULL); - hasher->get_hash(hasher, chunk_skip(data, 2), hash.ptr); - if (!memeq(vector->hash, hash.ptr, hash.len)) + if (!hasher->get_hash(hasher, chunk_create(data.ptr + 1, 1), NULL) || + !hasher->get_hash(hasher, chunk_skip(data, 2), hash.ptr) || + !memeq(vector->hash, hash.ptr, hash.len)) { failed = TRUE; } |