Add derive_key variant supporting AD and secret key

1 files changed, 14 insertions, 0 deletions

diff --git a/src/lib/pbkdf/argon2/argon2pwhash.cpp b/src/lib/pbkdf/argon2/argon2pwhash.cpp
index 6df23127c..a9d1994c3 100644
--- a/src/lib/pbkdf/argon2/argon2pwhash.cpp
+++ b/src/lib/pbkdf/argon2/argon2pwhash.cpp
@@ -30,6 +30,20 @@ void Argon2::derive_key(uint8_t output[], size_t output_len,
           m_family, m_p, m_M, m_t);
    }
 
+void Argon2::derive_key(uint8_t output[], size_t output_len,
+                        const char* password, size_t password_len,
+                        const uint8_t salt[], size_t salt_len,
+                        const uint8_t ad[], size_t ad_len,
+                        const uint8_t key[], size_t key_len) const
+   {
+   argon2(output, output_len,
+          password, password_len,
+          salt, salt_len,
+          key, key_len,
+          ad, ad_len,
+          m_family, m_p, m_M, m_t);
+   }
+
 namespace {
 
 std::string argon2_family_name(uint8_t f)