diff options
author | Jack Lloyd <[email protected]> | 2016-12-11 15:28:38 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2016-12-18 16:48:24 -0500 |
commit | f3cb3edb512bdcab498d825886c3366c341b3f78 (patch) | |
tree | 645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/kdf/kdf1/kdf1.cpp | |
parent | c1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff) |
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency,
eg make_u32bit becomes make_uint32. The old typedefs remain for now
since probably lots of application code uses them.
Diffstat (limited to 'src/lib/kdf/kdf1/kdf1.cpp')
-rw-r--r-- | src/lib/kdf/kdf1/kdf1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/kdf/kdf1/kdf1.cpp b/src/lib/kdf/kdf1/kdf1.cpp index 14dddc5f4..be22b1e9f 100644 --- a/src/lib/kdf/kdf1/kdf1.cpp +++ b/src/lib/kdf/kdf1/kdf1.cpp @@ -9,10 +9,10 @@ namespace Botan { -size_t KDF1::kdf(byte key[], size_t key_len, - const byte secret[], size_t secret_len, - const byte salt[], size_t salt_len, - const byte label[], size_t label_len) const +size_t KDF1::kdf(uint8_t key[], size_t key_len, + const uint8_t secret[], size_t secret_len, + const uint8_t salt[], size_t salt_len, + const uint8_t label[], size_t label_len) const { m_hash->update(secret, secret_len); m_hash->update(label, label_len); @@ -20,7 +20,7 @@ size_t KDF1::kdf(byte key[], size_t key_len, if(key_len < m_hash->output_length()) { - secure_vector<byte> v = m_hash->final(); + secure_vector<uint8_t> v = m_hash->final(); copy_mem(key, v.data(), key_len); return key_len; } |