diff options
| author | Jack Lloyd <[email protected]> | 2015-09-21 14:59:01 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-09-21 14:59:01 -0400 |
| commit | 04319af23bf8ed467b17f9b74c814343e051ab6b (patch) | |
| tree | 630d1a0cc931e77e7e1f07319e5cf89d00af4458 /src/lib/block | |
| parent | 408ea0a9b8ed0f575f8ee26891473920b42ef026 (diff) | |
Remove use of lookup.h in favor of new T::create API.
Diffstat (limited to 'src/lib/block')
| -rw-r--r-- | src/lib/block/cascade/cascade.cpp | 5 | ||||
| -rw-r--r-- | src/lib/block/lion/lion.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/block/cascade/cascade.cpp b/src/lib/block/cascade/cascade.cpp index 66ff293ff..100fb33ab 100644 --- a/src/lib/block/cascade/cascade.cpp +++ b/src/lib/block/cascade/cascade.cpp @@ -6,14 +6,13 @@ */ #include <botan/cascade.h> -#include <botan/lookup.h> namespace Botan { Cascade_Cipher* Cascade_Cipher::make(const BlockCipher::Spec& spec) { - std::unique_ptr<BlockCipher> c1(get_block_cipher(spec.arg(0))); - std::unique_ptr<BlockCipher> c2(get_block_cipher(spec.arg(1))); + std::unique_ptr<BlockCipher> c1(BlockCipher::create(spec.arg(0))); + std::unique_ptr<BlockCipher> c2(BlockCipher::create(spec.arg(1))); if(c1 && c2) return new Cascade_Cipher(c1.release(), c2.release()); diff --git a/src/lib/block/lion/lion.cpp b/src/lib/block/lion/lion.cpp index bbd24a3c1..559816aea 100644 --- a/src/lib/block/lion/lion.cpp +++ b/src/lib/block/lion/lion.cpp @@ -6,7 +6,6 @@ */ #include <botan/lion.h> -#include <botan/lookup.h> #include <botan/parsing.h> namespace Botan { @@ -15,8 +14,8 @@ Lion* Lion::make(const BlockCipher::Spec& spec) { if(spec.arg_count_between(2, 3)) { - std::unique_ptr<HashFunction> hash(get_hash_function(spec.arg(0))); - std::unique_ptr<StreamCipher> stream(get_stream_cipher(spec.arg(1))); + std::unique_ptr<HashFunction> hash(HashFunction::create(spec.arg(0))); + std::unique_ptr<StreamCipher> stream(StreamCipher::create(spec.arg(1))); if(hash && stream) { |