diff options
author | Jack Lloyd <[email protected]> | 2016-10-11 13:00:57 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2016-10-21 16:53:16 -0400 |
commit | 558808900bffc3c48da5e6d79ba602e88e619154 (patch) | |
tree | fd76ee2d009c2b707d888683cbd767351c4ff6b3 /src/lib/kdf/sp800_56c | |
parent | 6aa855bba613c7b6fedfbe71d15930964acb1633 (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/kdf/sp800_56c')
-rw-r--r-- | src/lib/kdf/sp800_56c/sp800_56c.cpp | 14 | ||||
-rw-r--r-- | src/lib/kdf/sp800_56c/sp800_56c.h | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/kdf/sp800_56c/sp800_56c.cpp b/src/lib/kdf/sp800_56c/sp800_56c.cpp index 338feba2a..f6d01ec2f 100644 --- a/src/lib/kdf/sp800_56c/sp800_56c.cpp +++ b/src/lib/kdf/sp800_56c/sp800_56c.cpp @@ -11,20 +11,6 @@ namespace Botan { -SP800_56C* SP800_56C::make(const Spec& spec) - { - if(auto exp = SP800_108_Feedback::make(spec)) - { - if(auto mac = MessageAuthenticationCode::create(spec.arg(0))) - return new SP800_56C(mac.release(), exp); - - if(auto mac = MessageAuthenticationCode::create("HMAC(" + spec.arg(0) + ")")) - return new SP800_56C(mac.release(), exp); - } - - return nullptr; - } - size_t SP800_56C::kdf(byte key[], size_t key_len, const byte secret[], size_t secret_len, const byte salt[], size_t salt_len, diff --git a/src/lib/kdf/sp800_56c/sp800_56c.h b/src/lib/kdf/sp800_56c/sp800_56c.h index 83f11906a..5c5acb075 100644 --- a/src/lib/kdf/sp800_56c/sp800_56c.h +++ b/src/lib/kdf/sp800_56c/sp800_56c.h @@ -50,8 +50,6 @@ class BOTAN_DLL SP800_56C : public KDF * @param exp KDF used for key expansion */ SP800_56C(MessageAuthenticationCode* mac, KDF* exp) : m_prf(mac), m_exp(exp) {} - - static SP800_56C* make(const Spec& spec); private: std::unique_ptr<MessageAuthenticationCode> m_prf; std::unique_ptr<KDF> m_exp; |