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/ffi | |
| parent | 8578e0fc758b81d176d0c5092417f4cc77676895 (diff) | |
add label parameter to KDF::derive_key
Diffstat (limited to 'src/lib/ffi')
| -rw-r--r-- | src/lib/ffi/ffi.cpp | 5 | ||||
| -rw-r--r-- | src/lib/ffi/ffi.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp index 11084ae50..028b286b6 100644 --- a/src/lib/ffi/ffi.cpp +++ b/src/lib/ffi/ffi.cpp @@ -653,12 +653,13 @@ int botan_pbkdf_timed(const char* pbkdf_algo, int botan_kdf(const char* kdf_algo, uint8_t out[], size_t out_len, const uint8_t secret[], size_t secret_len, - const uint8_t salt[], size_t salt_len) + const uint8_t salt[], size_t salt_len, + const uint8_t label[], size_t label_len) { try { std::unique_ptr<Botan::KDF> kdf(Botan::get_kdf(kdf_algo)); - kdf->kdf(out, out_len, secret, secret_len, salt, salt_len); + kdf->kdf(out, out_len, secret, secret_len, salt, salt_len, label, label_len); return 0; } catch(std::exception& e) diff --git a/src/lib/ffi/ffi.h b/src/lib/ffi/ffi.h index 6cbe56743..165554105 100644 --- a/src/lib/ffi/ffi.h +++ b/src/lib/ffi/ffi.h @@ -269,7 +269,8 @@ BOTAN_DLL int botan_pbkdf_timed(const char* pbkdf_algo, BOTAN_DLL int botan_kdf(const char* kdf_algo, uint8_t out[], size_t out_len, const uint8_t secret[], size_t secret_len, - const uint8_t salt[], size_t salt_len); + const uint8_t salt[], size_t salt_len, + const uint8_t label[], size_t label_len); /* * Bcrypt |