diff options
Diffstat (limited to 'src/lib/ffi')
| -rw-r--r-- | src/lib/ffi/ffi.cpp | 7 | ||||
| -rw-r--r-- | src/lib/ffi/ffi.h | 3 | ||||
| -rw-r--r-- | src/lib/ffi/info.txt | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp index 11084ae50..e42f32234 100644 --- a/src/lib/ffi/ffi.cpp +++ b/src/lib/ffi/ffi.cpp @@ -287,7 +287,7 @@ int botan_rng_get(botan_rng_t rng, uint8_t* out, size_t out_len) int botan_rng_reseed(botan_rng_t rng, size_t bits) { - return BOTAN_FFI_DO(Botan::RandomNumberGenerator, rng, r, { r.reseed(bits); }); + return BOTAN_FFI_DO(Botan::RandomNumberGenerator, rng, r, { r.reseed_from_rng(Botan::system_rng(), bits); }); } int botan_hash_init(botan_hash_t* hash, const char* hash_name, uint32_t flags) @@ -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 diff --git a/src/lib/ffi/info.txt b/src/lib/ffi/info.txt index 7c8968ff0..057bbd012 100644 --- a/src/lib/ffi/info.txt +++ b/src/lib/ffi/info.txt @@ -7,7 +7,6 @@ pbkdf pubkey x509 #tls -auto_rng system_rng </requires> |