diff options
| author | lloyd <[email protected]> | 2015-02-04 04:03:38 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-02-04 04:03:38 +0000 |
| commit | 0dd060fed07b0060f94e3bae62e125a85c1bb877 (patch) | |
| tree | ed4bc7a961e2b30f17ed5e80769c84b0c313c8b7 /src/lib/kdf | |
| parent | f9a7c85b74be0f4a7273e8e0591703af83036e81 (diff) | |
Remove algo factory, engines, global RNG, global state, etc.
Convert all uses of Algorithm_Factory and the engines to using Algo_Registry
The shared pool of entropy sources remains but is moved to EntropySource.
With that and few remaining initializations (default OIDs and aliases)
moved elsewhere, the global state is empty and init and shutdown are no-ops.
Remove almost all of the headers and code for handling the global
state, except LibraryInitializer which remains as a compatability stub.
Update seeding for blinding so only one hacky almost-global RNG
instance needs to be setup instead of across all pubkey uses (it uses
either the system RNG or an AutoSeeded_RNG if the system RNG is not
available).
Diffstat (limited to 'src/lib/kdf')
| -rw-r--r-- | src/lib/kdf/info.txt | 3 | ||||
| -rw-r--r-- | src/lib/kdf/kdf.cpp | 2 | ||||
| -rw-r--r-- | src/lib/kdf/kdf_utils.h | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/kdf/info.txt b/src/lib/kdf/info.txt index 91489ca24..35032e159 100644 --- a/src/lib/kdf/info.txt +++ b/src/lib/kdf/info.txt @@ -1,8 +1,7 @@ define KDF_BASE 20131128 <requires> -alloc -libstate +base </requires> <header:public> diff --git a/src/lib/kdf/kdf.cpp b/src/lib/kdf/kdf.cpp index e18d9ce75..793cd3d62 100644 --- a/src/lib/kdf/kdf.cpp +++ b/src/lib/kdf/kdf.cpp @@ -6,7 +6,7 @@ */ #include <botan/kdf.h> -#include <botan/algo_registry.h> +#include <botan/internal/algo_registry.h> #include <botan/exceptn.h> namespace Botan { diff --git a/src/lib/kdf/kdf_utils.h b/src/lib/kdf/kdf_utils.h index bf2bfb235..f67892437 100644 --- a/src/lib/kdf/kdf_utils.h +++ b/src/lib/kdf/kdf_utils.h @@ -5,11 +5,11 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#ifndef BOTAN_KDF_UTIL_H__ -#define BOTAN_KDF_UTIL_H__ +#ifndef BOTAN_KDF_UTILS_H__ +#define BOTAN_KDF_UTILS_H__ #include <botan/kdf.h> -#include <botan/algo_registry.h> +#include <botan/internal/algo_registry.h> #include <botan/exceptn.h> #include <botan/internal/xor_buf.h> |