aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/cmd/speed_pk.cpp6
-rw-r--r--src/tests/test_dlies.cpp8
2 files changed, 11 insertions, 3 deletions
diff --git a/src/cmd/speed_pk.cpp b/src/cmd/speed_pk.cpp
index dc0ee79da..035b9a3af 100644
--- a/src/cmd/speed_pk.cpp
+++ b/src/cmd/speed_pk.cpp
@@ -47,7 +47,7 @@
#include <botan/elgamal.h>
#endif
-#if defined(BOTAN_HAS_DLIES)
+#if defined(BOTAN_HAS_DLIES) && defined(BOTAN_HAS_KDF2)
#include <botan/dlies.h>
#include <botan/kdf2.h>
#include <botan/hmac.h>
@@ -614,7 +614,7 @@ void benchmark_dh(RandomNumberGenerator& rng,
}
#endif
-#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES)
+#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES) && defined(BOTAN_HAS_KDF2)
void benchmark_dlies(RandomNumberGenerator& rng,
double seconds,
Benchmark_Report& report)
@@ -850,7 +850,7 @@ void bench_pk(RandomNumberGenerator& rng,
benchmark_dh(rng, seconds, report);
#endif
-#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES)
+#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES) && defined(BOTAN_HAS_KDF2)
if(algo == "All" || algo == "DLIES")
benchmark_dlies(rng, seconds, report);
#endif
diff --git a/src/tests/test_dlies.cpp b/src/tests/test_dlies.cpp
index 8fc1f31a0..40b48c61f 100644
--- a/src/tests/test_dlies.cpp
+++ b/src/tests/test_dlies.cpp
@@ -8,6 +8,8 @@
#if defined(BOTAN_HAS_DLIES)
+#if defined(BOTAN_HAS_DIFFIE_HELLMAN)
+
#include "test_pubkey.h"
#include <iostream>
@@ -86,6 +88,12 @@ size_t test_dlies()
#else
+UNTESTED_WARNING(dlies);
+
+#endif // BOTAN_HAS_DIFFIE_HELLMAN
+
+#else
+
SKIP_TEST(dlies);
#endif // BOTAN_HAS_DLIES