diff options
author | lloyd <lloyd@randombit.net> | 2010-10-12 16:23:03 +0000 |
---|---|---|
committer | lloyd <lloyd@randombit.net> | 2010-10-12 16:23:03 +0000 |
commit | e3e02712563e03fbfd6b474cfaa7c0dfdf08f267 (patch) | |
tree | 2d5049051b774cd902b6658781543ce4dc9834fe /src/kdf/kdf.cpp | |
parent | 4a6fd8c70d40f88c8b51127bfa055b66b18e0f7a (diff) |
s/u32bit/size_t/ in kdf
Diffstat (limited to 'src/kdf/kdf.cpp')
-rw-r--r-- | src/kdf/kdf.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/kdf/kdf.cpp b/src/kdf/kdf.cpp index 04f44f2f4..6281f753c 100644 --- a/src/kdf/kdf.cpp +++ b/src/kdf/kdf.cpp @@ -12,7 +12,7 @@ namespace Botan { /* * Derive a key */ -SecureVector<byte> KDF::derive_key(u32bit key_len, +SecureVector<byte> KDF::derive_key(size_t key_len, const MemoryRegion<byte>& secret, const std::string& salt) const { @@ -24,9 +24,9 @@ SecureVector<byte> KDF::derive_key(u32bit key_len, /* * Derive a key */ -SecureVector<byte> KDF::derive_key(u32bit key_len, +SecureVector<byte> KDF::derive_key(size_t key_len, const MemoryRegion<byte>& secret, - const byte salt[], u32bit salt_len) const + const byte salt[], size_t salt_len) const { return derive_key(key_len, &secret[0], secret.size(), salt, salt_len); @@ -35,7 +35,7 @@ SecureVector<byte> KDF::derive_key(u32bit key_len, /* * Derive a key */ -SecureVector<byte> KDF::derive_key(u32bit key_len, +SecureVector<byte> KDF::derive_key(size_t key_len, const MemoryRegion<byte>& secret, const MemoryRegion<byte>& salt) const { @@ -46,8 +46,8 @@ SecureVector<byte> KDF::derive_key(u32bit key_len, /* * Derive a key */ -SecureVector<byte> KDF::derive_key(u32bit key_len, - const byte secret[], u32bit secret_len, +SecureVector<byte> KDF::derive_key(size_t key_len, + const byte secret[], size_t secret_len, const std::string& salt) const { return derive_key(key_len, secret, secret_len, @@ -58,9 +58,9 @@ SecureVector<byte> KDF::derive_key(u32bit key_len, /* * Derive a key */ -SecureVector<byte> KDF::derive_key(u32bit key_len, - const byte secret[], u32bit secret_len, - const byte salt[], u32bit salt_len) const +SecureVector<byte> KDF::derive_key(size_t key_len, + const byte secret[], size_t secret_len, + const byte salt[], size_t salt_len) const { return derive(key_len, secret, secret_len, salt, salt_len); } |