diff options
| author | Kai Michaelis <[email protected]> | 2016-04-28 15:52:41 +0200 |
|---|---|---|
| committer | Kai Michaelis <[email protected]> | 2016-05-19 15:48:09 +0200 |
| commit | 55cd86e31f94ed330c0c7a53a577750a92a2b533 (patch) | |
| tree | c761b939e585471ca7d340271697edafa0fc1a11 /src/lib/kdf/kdf2 | |
| parent | 8578e0fc758b81d176d0c5092417f4cc77676895 (diff) | |
add label parameter to KDF::derive_key
Diffstat (limited to 'src/lib/kdf/kdf2')
| -rw-r--r-- | src/lib/kdf/kdf2/kdf2.cpp | 3 | ||||
| -rw-r--r-- | src/lib/kdf/kdf2/kdf2.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/kdf/kdf2/kdf2.cpp b/src/lib/kdf/kdf2/kdf2.cpp index df2b7a91c..32bf678f7 100644 --- a/src/lib/kdf/kdf2/kdf2.cpp +++ b/src/lib/kdf/kdf2/kdf2.cpp @@ -11,7 +11,8 @@ namespace Botan { size_t KDF2::kdf(byte key[], size_t key_len, const byte secret[], size_t secret_len, - const byte salt[], size_t salt_len) const + const byte salt[], size_t salt_len, + const byte[], size_t) const { u32bit counter = 1; secure_vector<byte> h; diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h index 7403df21c..600f7c91c 100644 --- a/src/lib/kdf/kdf2/kdf2.h +++ b/src/lib/kdf/kdf2/kdf2.h @@ -25,7 +25,8 @@ class BOTAN_DLL KDF2 final : public KDF size_t kdf(byte key[], size_t key_len, const byte secret[], size_t secret_len, - const byte salt[], size_t salt_len) const override; + const byte salt[], size_t salt_len, + const byte label[], size_t label_len) const override; explicit KDF2(HashFunction* h) : m_hash(h) {} private: |