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/constructs/pbes2 | |
| 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/constructs/pbes2')
| -rw-r--r-- | src/lib/constructs/pbes2/info.txt | 1 | ||||
| -rw-r--r-- | src/lib/constructs/pbes2/pbes2.cpp | 2 | ||||
| -rw-r--r-- | src/lib/constructs/pbes2/pbes2.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/constructs/pbes2/info.txt b/src/lib/constructs/pbes2/info.txt index e1f260966..8a1ca491e 100644 --- a/src/lib/constructs/pbes2/info.txt +++ b/src/lib/constructs/pbes2/info.txt @@ -1,7 +1,6 @@ define PKCS5_PBES2 20141119 <requires> -algo_factory asn1 block cbc diff --git a/src/lib/constructs/pbes2/pbes2.cpp b/src/lib/constructs/pbes2/pbes2.cpp index 811806891..17f14170d 100644 --- a/src/lib/constructs/pbes2/pbes2.cpp +++ b/src/lib/constructs/pbes2/pbes2.cpp @@ -6,7 +6,7 @@ */ #include <botan/pbes2.h> -#include <botan/algo_registry.h> +#include <botan/internal/algo_registry.h> #include <botan/cipher_mode.h> #include <botan/pbkdf2.h> #include <botan/der_enc.h> diff --git a/src/lib/constructs/pbes2/pbes2.h b/src/lib/constructs/pbes2/pbes2.h index 3aa7d1159..90aa4f84b 100644 --- a/src/lib/constructs/pbes2/pbes2.h +++ b/src/lib/constructs/pbes2/pbes2.h @@ -11,7 +11,6 @@ #include <botan/secmem.h> #include <botan/transform.h> #include <botan/alg_id.h> -#include <botan/algo_factory.h> #include <chrono> namespace Botan { |