diff options
| author | Jack Lloyd <[email protected]> | 2015-09-21 16:09:36 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-09-21 16:09:36 -0400 |
| commit | 7ebe7511496b8a6950acced513a81516565354ed (patch) | |
| tree | add1163c2afbd1ae3d163aaac8375a3b56bd6c9c /src/tests/test_stream.cpp | |
| parent | 8f732dccce692eaca509fc9732702df62cfa5c87 (diff) | |
| parent | 04319af23bf8ed467b17f9b74c814343e051ab6b (diff) | |
Merge pull request #279 from randombit/fix-static-lib-registration
Move the algorithm factory functions to T::create and move object registration to the source file for its base class. These resolve the issues which prevented successful use of a static library that was built with individual object files. Removes the restriction in configure.py which prevented building non-amalgamation static libs.
Diffstat (limited to 'src/tests/test_stream.cpp')
| -rw-r--r-- | src/tests/test_stream.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tests/test_stream.cpp b/src/tests/test_stream.cpp index 4828d44fd..046c199ec 100644 --- a/src/tests/test_stream.cpp +++ b/src/tests/test_stream.cpp @@ -9,7 +9,6 @@ #if defined(BOTAN_HAS_STREAM_CIPHER) #include <botan/stream_cipher.h> -#include <botan/lookup.h> #include <botan/hex.h> #include <iostream> #include <fstream> @@ -29,7 +28,7 @@ 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); - const std::vector<std::string> providers = get_stream_cipher_providers(algo); + const std::vector<std::string> providers = StreamCipher::providers(algo); size_t fails = 0; if(providers.empty()) @@ -40,7 +39,7 @@ size_t stream_test(const std::string& algo, for(auto provider: providers) { - std::unique_ptr<StreamCipher> cipher(get_stream_cipher(algo, provider)); + std::unique_ptr<StreamCipher> cipher(StreamCipher::create(algo, provider)); if(!cipher) { |