aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbkdf/pbkdf2/pbkdf2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/pbkdf/pbkdf2/pbkdf2.cpp')
-rw-r--r--src/pbkdf/pbkdf2/pbkdf2.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pbkdf/pbkdf2/pbkdf2.cpp b/src/pbkdf/pbkdf2/pbkdf2.cpp
index 7e4d1cd8a..699ce7c6b 100644
--- a/src/pbkdf/pbkdf2/pbkdf2.cpp
+++ b/src/pbkdf/pbkdf2/pbkdf2.cpp
@@ -30,14 +30,14 @@ OctetString PKCS5_PBKDF2::derive_key(size_t key_len,
catch(Invalid_Key_Length)
{
throw Exception(name() + " cannot accept passphrases of length " +
- to_string(passphrase.length()));
+ std::to_string(passphrase.length()));
}
- SecureVector<byte> key(key_len);
+ secure_vector<byte> key(key_len);
byte* T = &key[0];
- SecureVector<byte> U(mac->output_length());
+ secure_vector<byte> U(mac->output_length());
u32bit counter = 1;
while(key_len)
@@ -48,13 +48,13 @@ OctetString PKCS5_PBKDF2::derive_key(size_t key_len,
mac->update_be(counter);
mac->final(&U[0]);
- xor_buf(T, U, T_size);
+ xor_buf(T, &U[0], T_size);
for(size_t j = 1; j != iterations; ++j)
{
mac->update(U);
mac->final(&U[0]);
- xor_buf(T, U, T_size);
+ xor_buf(T, &U[0], T_size);
}
key_len -= T_size;