VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Volume
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-08-16 22:06:57 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-08-16 22:08:18 (GMT)
commit2780ac962ec75f548acb616dd810515e528ac0b1 (patch)
tree3c89dab46a6f225b8e2caf04a8d51c6a29b0e6f0 /src/Volume
parente47f94cb4329cfefb0a9c4efaa353a1b54268b46 (diff)
downloadVeraCrypt-2780ac962ec75f548acb616dd810515e528ac0b1.zip
VeraCrypt-2780ac962ec75f548acb616dd810515e528ac0b1.tar.gz
Linux: fix various compilation issues under Linux.
Diffstat (limited to 'src/Volume')
-rw-r--r--src/Volume/Hash.cpp2
-rw-r--r--src/Volume/Pkcs5Kdf.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Volume/Hash.cpp b/src/Volume/Hash.cpp
index ea3517e..2bc459c 100644
--- a/src/Volume/Hash.cpp
+++ b/src/Volume/Hash.cpp
@@ -161,6 +161,6 @@ namespace VeraCrypt
void Streebog::ProcessData (const ConstBufferPtr &data)
{
if_debug (ValidateDataParameters (data));
- STREEBOG_add (data.Get(), (int) data.Size(), (STREEBOG_CTX *) Context.Ptr());
+ STREEBOG_add ((STREEBOG_CTX *) Context.Ptr(), data.Get(), (int) data.Size());
}
}
diff --git a/src/Volume/Pkcs5Kdf.h b/src/Volume/Pkcs5Kdf.h
index c10efaf..acbcbfa 100644
--- a/src/Volume/Pkcs5Kdf.h
+++ b/src/Volume/Pkcs5Kdf.h
@@ -163,7 +163,7 @@ namespace VeraCrypt
virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Streebog); }
virtual int GetIterationCount (int pim) const { return pim <= 0 ? 500000 : (15000 + (pim * 1000)); }
virtual wstring GetName () const { return L"HMAC-Streebog"; }
- virtual Pkcs5Kdf* Clone () const { return new Pkcs5HmacStreebog(m_truecryptMode); }
+ virtual Pkcs5Kdf* Clone () const { return new Pkcs5HmacStreebog(); }
private:
Pkcs5HmacStreebog (const Pkcs5HmacStreebog &);
@@ -180,7 +180,7 @@ namespace VeraCrypt
virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Streebog); }
virtual int GetIterationCount (int pim) const { return pim <= 0 ? 200000 : pim * 2048; }
virtual wstring GetName () const { return L"HMAC-Streebog"; }
- virtual Pkcs5Kdf* Clone () const { return new Pkcs5HmacStreebog_Boot(m_truecryptMode); }
+ virtual Pkcs5Kdf* Clone () const { return new Pkcs5HmacStreebog_Boot(); }
private:
Pkcs5HmacStreebog_Boot (const Pkcs5HmacStreebog_Boot &);