diff options
Diffstat (limited to 'src/lib/kdf/sp800_108')
| -rw-r--r-- | src/lib/kdf/sp800_108/sp800_108.cpp | 33 | ||||
| -rw-r--r-- | src/lib/kdf/sp800_108/sp800_108.h | 5 |
2 files changed, 0 insertions, 38 deletions
diff --git a/src/lib/kdf/sp800_108/sp800_108.cpp b/src/lib/kdf/sp800_108/sp800_108.cpp index aafb349b2..77973600a 100644 --- a/src/lib/kdf/sp800_108/sp800_108.cpp +++ b/src/lib/kdf/sp800_108/sp800_108.cpp @@ -12,17 +12,6 @@ namespace Botan { -SP800_108_Counter* SP800_108_Counter::make(const Spec& spec) - { - if(auto mac = MessageAuthenticationCode::create(spec.arg(0))) - return new SP800_108_Counter(mac.release()); - - if(auto mac = MessageAuthenticationCode::create("HMAC(" + spec.arg(0) + ")")) - return new SP800_108_Counter(mac.release()); - - return nullptr; - } - size_t SP800_108_Counter::kdf(byte key[], size_t key_len, const byte secret[], size_t secret_len, const byte salt[], size_t salt_len, @@ -65,17 +54,6 @@ size_t SP800_108_Counter::kdf(byte key[], size_t key_len, return key_len; } -SP800_108_Feedback* SP800_108_Feedback::make(const Spec& spec) - { - if(auto mac = MessageAuthenticationCode::create(spec.arg(0))) - return new SP800_108_Feedback(mac.release()); - - if(auto mac = MessageAuthenticationCode::create("HMAC(" + spec.arg(0) + ")")) - return new SP800_108_Feedback(mac.release()); - - return nullptr; - } - size_t SP800_108_Feedback::kdf(byte key[], size_t key_len, const byte secret[], size_t secret_len, const byte salt[], size_t salt_len, @@ -122,17 +100,6 @@ size_t SP800_108_Feedback::kdf(byte key[], size_t key_len, return key_len; } -SP800_108_Pipeline* SP800_108_Pipeline::make(const Spec& spec) - { - if(auto mac = MessageAuthenticationCode::create(spec.arg(0))) - return new SP800_108_Pipeline(mac.release()); - - if(auto mac = MessageAuthenticationCode::create("HMAC(" + spec.arg(0) + ")")) - return new SP800_108_Pipeline(mac.release()); - - return nullptr; - } - size_t SP800_108_Pipeline::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_108/sp800_108.h b/src/lib/kdf/sp800_108/sp800_108.h index 2d4d028b2..e368457b4 100644 --- a/src/lib/kdf/sp800_108/sp800_108.h +++ b/src/lib/kdf/sp800_108/sp800_108.h @@ -49,8 +49,6 @@ class BOTAN_DLL SP800_108_Counter : public KDF * @param mac MAC algorithm to use */ SP800_108_Counter(MessageAuthenticationCode* mac) : m_prf(mac) {} - - static SP800_108_Counter* make(const Spec& spec); private: std::unique_ptr<MessageAuthenticationCode> m_prf; }; @@ -88,8 +86,6 @@ class BOTAN_DLL SP800_108_Feedback : public KDF const byte label[], size_t label_len) const override; SP800_108_Feedback(MessageAuthenticationCode* mac) : m_prf(mac) {} - - static SP800_108_Feedback* make(const Spec& spec); private: std::unique_ptr<MessageAuthenticationCode> m_prf; }; @@ -128,7 +124,6 @@ class BOTAN_DLL SP800_108_Pipeline : public KDF SP800_108_Pipeline(MessageAuthenticationCode* mac) : m_prf(mac) {} - static SP800_108_Pipeline* make(const Spec& spec); private: std::unique_ptr<MessageAuthenticationCode> m_prf; }; |