aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbkdf
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-09-14 02:05:05 +0000
committerlloyd <[email protected]>2010-09-14 02:05:05 +0000
commit77a33b0c16880884cc0326e92c0c30d0e8444a91 (patch)
treedf2d917b312abb79c8654558399521366dbb2d14 /src/pbkdf
parent59a9b0ef260b010606edc3384035b6aa12dd6415 (diff)
More changes to avoid vector to pointer implicit conversions
Diffstat (limited to 'src/pbkdf')
-rw-r--r--src/pbkdf/pbkdf1/pbkdf1.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pbkdf/pbkdf1/pbkdf1.cpp b/src/pbkdf/pbkdf1/pbkdf1.cpp
index d9bdf1b1f..20875ebc2 100644
--- a/src/pbkdf/pbkdf1/pbkdf1.cpp
+++ b/src/pbkdf/pbkdf1/pbkdf1.cpp
@@ -31,10 +31,10 @@ OctetString PKCS5_PBKDF1::derive_key(u32bit key_len,
for(u32bit j = 1; j != iterations; ++j)
{
hash->update(key);
- hash->final(key);
+ hash->final(&key[0]);
}
- return OctetString(key, std::min<u32bit>(key_len, key.size()));
+ return OctetString(&key[0], std::min<u32bit>(key_len, key.size()));
}
}