diff options
| author | lloyd <[email protected]> | 2010-03-19 18:46:14 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-03-19 18:46:14 +0000 |
| commit | 7ac5dc634e2448392b298376936d3f57abc9c40b (patch) | |
| tree | 6abf549f9e53889ac9d12c1482350685139c1e3d | |
| parent | 602fb0e763cfaa2caa62b3b239d021efc767d567 (diff) | |
Don't require the AES module; if it's there its there, if it's not
then you can't use the global PRNG but everything else still works.
| -rw-r--r-- | src/libstate/global_rng.cpp | 4 | ||||
| -rw-r--r-- | src/libstate/info.txt | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libstate/global_rng.cpp b/src/libstate/global_rng.cpp index c18705a3a..411596da9 100644 --- a/src/libstate/global_rng.cpp +++ b/src/libstate/global_rng.cpp @@ -169,7 +169,7 @@ RandomNumberGenerator* Library_State::make_global_rng(Algorithm_Factory& af, rng = new HMAC_RNG(af.make_mac("HMAC(SHA-512)"), af.make_mac("HMAC(SHA-256)")); -#elif defined(BOTAN_HAS_RANDPOOL) && defined(BOTAN_HAS_AES) +#elif defined(BOTAN_HAS_RANDPOOL) rng = new Randpool(af.make_block_cipher("AES-256"), af.make_mac("HMAC(SHA-256)")); @@ -180,7 +180,7 @@ RandomNumberGenerator* Library_State::make_global_rng(Algorithm_Factory& af, throw Internal_Error("No usable RNG found enabled in build"); /* If X9.31 is available, use it to wrap the other RNG as a failsafe */ -#if defined(BOTAN_HAS_X931_RNG) && defined(BOTAN_HAS_AES) +#if defined(BOTAN_HAS_X931_RNG) rng = new ANSI_X931_RNG(af.make_block_cipher("AES-256"), rng); diff --git a/src/libstate/info.txt b/src/libstate/info.txt index 905675109..0829506fb 100644 --- a/src/libstate/info.txt +++ b/src/libstate/info.txt @@ -30,7 +30,6 @@ def_engine engine filters hash -hmac kdf mac mode_pad @@ -40,7 +39,6 @@ pk_pad pubkey rng s2k -sha2 stream system_alloc </requires> |