aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/block/cascade
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-10-11 13:00:57 -0400
committerJack Lloyd <[email protected]>2016-10-21 16:53:16 -0400
commit558808900bffc3c48da5e6d79ba602e88e619154 (patch)
treefd76ee2d009c2b707d888683cbd767351c4ff6b3 /src/lib/block/cascade
parent6aa855bba613c7b6fedfbe71d15930964acb1633 (diff)
Remove Algo_Registry
I repent my use of global constructors. I repent my use of global locks. Hopefully I will never touch this code again. :)
Diffstat (limited to 'src/lib/block/cascade')
-rw-r--r--src/lib/block/cascade/cascade.cpp10
-rw-r--r--src/lib/block/cascade/cascade.h2
2 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/block/cascade/cascade.cpp b/src/lib/block/cascade/cascade.cpp
index 100fb33ab..98e862de9 100644
--- a/src/lib/block/cascade/cascade.cpp
+++ b/src/lib/block/cascade/cascade.cpp
@@ -9,16 +9,6 @@
namespace Botan {
-Cascade_Cipher* Cascade_Cipher::make(const BlockCipher::Spec& spec)
- {
- 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());
- return nullptr;
- }
-
void Cascade_Cipher::encrypt_n(const byte in[], byte out[],
size_t blocks) const
{
diff --git a/src/lib/block/cascade/cascade.h b/src/lib/block/cascade/cascade.h
index 21af5bea4..aa7bd0421 100644
--- a/src/lib/block/cascade/cascade.h
+++ b/src/lib/block/cascade/cascade.h
@@ -33,8 +33,6 @@ class BOTAN_DLL Cascade_Cipher final : public BlockCipher
std::string name() const override;
BlockCipher* clone() const override;
- static Cascade_Cipher* make(const Spec& spec);
-
/**
* Create a cascade of two block ciphers
* @param cipher1 the first cipher