aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-06-29 18:10:31 -0400
committerJack Lloyd <[email protected]>2019-06-29 18:10:31 -0400
commitaf0e74bd8413f9e9dd7ac1d137ec008fedd2d4c3 (patch)
tree6aa28e9ce284e1cb3465c215c56cce20fd980c4f
parent5922b1c3abf00c0e22e86498e1ee3a51e5343b0f (diff)
Fix some minimized build problems
-rw-r--r--src/cli/timing_tests.cpp6
-rw-r--r--src/lib/pbkdf/argon2/info.txt1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cli/timing_tests.cpp b/src/cli/timing_tests.cpp
index 577196c4d..b1c5b0bd7 100644
--- a/src/cli/timing_tests.cpp
+++ b/src/cli/timing_tests.cpp
@@ -44,7 +44,7 @@
#include <botan/system_rng.h>
#endif
-#if defined(BOTAN_HAS_AUTO_SEEDING_RNG)
+#if defined(BOTAN_HAS_AUTO_SEEDING_RNG) && defined(BOTAN_AUTO_RNG_HMAC)
#include <botan/auto_rng.h>
#endif
@@ -96,8 +96,8 @@ class Timing_Test
{
#if defined(BOTAN_HAS_SYSTEM_RNG)
return Botan::system_rng();
-#elif defined(BOTAN_HAS_AUTO_SEEDING_RNG)
- static AutoSeeded_RNG static_timing_test_rng(Botan::Entropy_Sources::global_sources(), 0);
+#elif defined(BOTAN_HAS_AUTO_SEEDING_RNG) && defined(BOTAN_AUTO_RNG_HMAC)
+ static Botan::AutoSeeded_RNG static_timing_test_rng;
return static_timing_test_rng;
#else
// we could just use SHA-256 in OFB mode for these purposes
diff --git a/src/lib/pbkdf/argon2/info.txt b/src/lib/pbkdf/argon2/info.txt
index 0c7adfeea..57667538a 100644
--- a/src/lib/pbkdf/argon2/info.txt
+++ b/src/lib/pbkdf/argon2/info.txt
@@ -4,5 +4,6 @@ ARGON2 -> 20190527
<requires>
blake2
+base64
</requires>