aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/kdf
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-01-18 18:17:08 +0000
committerlloyd <[email protected]>2014-01-18 18:17:08 +0000
commitb96ad4c05c0a8f835b54ef4e2cff849c749409b0 (patch)
treed8a5805e6d85cd66d2336f624f0cbeaaf1d5bed3 /src/lib/kdf
parent6b457468faa88180142de9bd2ba0fee90be43463 (diff)
Split off the keyed interfaces of transform to Keyed_Transform
Remove the unhelpful 'Algorithm' base class which had previously acted more or less as a global base.
Diffstat (limited to 'src/lib/kdf')
-rw-r--r--src/lib/kdf/kdf.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/kdf/kdf.h b/src/lib/kdf/kdf.h
index b0f6e1dc3..39e7253f9 100644
--- a/src/lib/kdf/kdf.h
+++ b/src/lib/kdf/kdf.h
@@ -8,7 +8,6 @@
#ifndef BOTAN_KDF_BASE_H__
#define BOTAN_KDF_BASE_H__
-#include <botan/algo_base.h>
#include <botan/secmem.h>
#include <botan/types.h>
@@ -17,9 +16,13 @@ namespace Botan {
/**
* Key Derivation Function
*/
-class BOTAN_DLL KDF : public Algorithm
+class BOTAN_DLL KDF
{
public:
+ virtual ~KDF() {}
+
+ virtual std::string name() const = 0;
+
/**
* Derive a key
* @param key_len the desired output length in bytes
@@ -102,8 +105,6 @@ class BOTAN_DLL KDF : public Algorithm
return derive(key_len, secret, secret_len, salt, salt_len);
}
- void clear() {}
-
virtual KDF* clone() const = 0;
private:
virtual secure_vector<byte>