aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Warta <[email protected]>2015-08-21 20:33:46 +0200
committerSimon Warta <[email protected]>2015-08-21 20:33:46 +0200
commit602c8174980193325b12795dfcea7eca13fb9778 (patch)
tree908277dc054dae4dc5f27a085ee1161b239d5a8c
parent2098560ec856292b624d6ec6c7898eee4acad8c5 (diff)
Reactivate FFI PBKDF minimum iterations test
as dicussed here: https://github.com/randombit/botan/commit/480999c2820b0da995108d7474a74755cafd2924
-rw-r--r--src/tests/test_ffi.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp
index 297351a98..5aa4930b9 100644
--- a/src/tests/test_ffi.cpp
+++ b/src/tests/test_ffi.cpp
@@ -152,15 +152,14 @@ TEST_CASE("FFI PBKDF", "[ffi]")
passphrase.c_str(), salt.data(), salt.size(), 100, &iters_100ms),
Equals(0));
+ CHECK(iters_10ms >= 10000);
+
/*
* Tests deactivated due to consistetly failing in debug mode where -W0 is set
* (./configure.py --build-mode=debug).
* See also: https://github.com/randombit/botan/commit/30b0e3c88e94ba04c1843798f7ac74a008e01d9b
*/
-
/*
- CHECK(iters_10ms >= 10000);
-
INFO("Iterations " << iters_10ms << " " << iters_100ms);
const double ratio = static_cast<double>(iters_100ms) / iters_10ms;
// Loose timing to avoid false positives on CI