diff options
| author | lloyd <[email protected]> | 2009-10-19 20:20:04 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-10-19 20:20:04 +0000 |
| commit | e4e6abb78f2287fe44ba83f896e21bf59eca57c9 (patch) | |
| tree | feb591bf990293a8d06cea49cbb63440b4ada0dd /src | |
| parent | f071947159a6b5397004442010c492f76cd89c8d (diff) | |
Format, add names to params in header
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdf/kdf.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/kdf/kdf.h b/src/kdf/kdf.h index 70f636b6c..67078218f 100644 --- a/src/kdf/kdf.h +++ b/src/kdf/kdf.h @@ -22,6 +22,7 @@ class BOTAN_DLL KDF SecureVector<byte> derive_key(u32bit key_len, const MemoryRegion<byte>& secret, const std::string& salt = "") const; + SecureVector<byte> derive_key(u32bit key_len, const MemoryRegion<byte>& secret, const MemoryRegion<byte>& salt) const; @@ -33,14 +34,17 @@ class BOTAN_DLL KDF SecureVector<byte> derive_key(u32bit key_len, const byte secret[], u32bit secret_len, const std::string& salt = "") const; + SecureVector<byte> derive_key(u32bit key_len, const byte secret[], u32bit secret_len, const byte salt[], u32bit salt_len) const; virtual ~KDF() {} private: - virtual SecureVector<byte> derive(u32bit, const byte[], u32bit, - const byte[], u32bit) const = 0; + virtual SecureVector<byte> + derive(u32bit key_len, + const byte secret[], u32bit secret_len, + const byte salt[], u32bit salt_len) const = 0; }; /* @@ -50,7 +54,7 @@ class BOTAN_DLL MGF { public: virtual void mask(const byte in[], u32bit in_len, - byte out[], u32bit out_len) const = 0; + byte out[], u32bit out_len) const = 0; virtual ~MGF() {} }; |