aboutsummaryrefslogtreecommitdiffstats
path: root/src/kdf/kdf.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-09-13 12:28:27 +0000
committerlloyd <[email protected]>2010-09-13 12:28:27 +0000
commit27d79c87365105d6128afe9eaf8a82383976ed44 (patch)
tree9a4f0e1d5ae7ecd5c058c0293d9b546191990cdb /src/kdf/kdf.cpp
parent9acfc3a50b31044e48d8dee5fc8030ad7f4518d4 (diff)
Anywhere where we use MemoryRegion::begin to get access to the raw pointer
representation (rather than in an interator context), instead use &buf[0], which works for both MemoryRegion and std::vector
Diffstat (limited to 'src/kdf/kdf.cpp')
-rw-r--r--src/kdf/kdf.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kdf/kdf.cpp b/src/kdf/kdf.cpp
index 4be8475df..86f5f2476 100644
--- a/src/kdf/kdf.cpp
+++ b/src/kdf/kdf.cpp
@@ -28,7 +28,7 @@ SecureVector<byte> KDF::derive_key(u32bit key_len,
const MemoryRegion<byte>& secret,
const byte salt[], u32bit salt_len) const
{
- return derive_key(key_len, secret.begin(), secret.size(),
+ return derive_key(key_len, &secret[0], secret.size(),
salt, salt_len);
}
@@ -39,8 +39,8 @@ SecureVector<byte> KDF::derive_key(u32bit key_len,
const MemoryRegion<byte>& secret,
const MemoryRegion<byte>& salt) const
{
- return derive_key(key_len, secret.begin(), secret.size(),
- salt.begin(), salt.size());
+ return derive_key(key_len, &secret[0], secret.size(),
+ &salt[0], salt.size());
}
/*