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/tests/test_stream.cpp | |
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/tests/test_stream.cpp')
-rw-r--r-- | src/tests/test_stream.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/tests/test_stream.cpp b/src/tests/test_stream.cpp index 3144e9f47..af782d219 100644 --- a/src/tests/test_stream.cpp +++ b/src/tests/test_stream.cpp @@ -6,8 +6,8 @@ #include "tests.h" -#include <botan/libstate.h> #include <botan/stream_cipher.h> +#include <botan/lookup.h> #include <botan/hex.h> #include <iostream> #include <fstream> @@ -27,29 +27,26 @@ size_t stream_test(const std::string& algo, const secure_vector<byte> ct = hex_decode_locked(out_hex); const secure_vector<byte> nonce = hex_decode_locked(nonce_hex); - Algorithm_Factory& af = global_state().algorithm_factory(); - - const auto providers = af.providers_of(algo); + const std::vector<std::string> providers = get_stream_cipher_providers(algo); size_t fails = 0; if(providers.empty()) { - std::cout << "Unknown algo " << algo << "\n"; + std::cout << "Unknown stream cipher " << algo << "\n"; ++fails; } for(auto provider: providers) { - const StreamCipher* proto = af.prototype_stream_cipher(algo, provider); + std::unique_ptr<StreamCipher> cipher(get_stream_cipher(algo, provider)); - if(!proto) + if(!cipher) { - std::cout << "Unable to get " << algo << " from provider '" << provider << "'\n"; + std::cout << "Unable to get " << algo << " from " << provider << "\n"; ++fails; continue; } - std::unique_ptr<StreamCipher> cipher(proto->clone()); cipher->set_key(key); if(nonce.size()) |