diff options
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/Volume/Pkcs5Kdf.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 321d3734..e6220fbe 100644 --- a/src/Makefile +++ b/src/Makefile @@ -67,7 +67,7 @@ endif ifdef PKCS11_INC C_CXX_FLAGS += -I$(PKCS11_INC) -+else +else C_CXX_FLAGS += -I$(CURDIR)/PKCS11 endif diff --git a/src/Volume/Pkcs5Kdf.cpp b/src/Volume/Pkcs5Kdf.cpp index 8f501976..9c2fa65b 100644 --- a/src/Volume/Pkcs5Kdf.cpp +++ b/src/Volume/Pkcs5Kdf.cpp @@ -22,7 +22,7 @@ namespace TrueCrypt void Pkcs5Kdf::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, BOOL bNotTest) const { - DeriveKey (key, password, salt, GetIterationCount(), bNoTest); + DeriveKey (key, password, salt, GetIterationCount(), bNotTest); } shared_ptr <Pkcs5Kdf> Pkcs5Kdf::GetAlgorithm (const wstring &name) @@ -67,13 +67,13 @@ namespace TrueCrypt void Pkcs5HmacRipemd160::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount, BOOL bNotTest) const { ValidateParameters (key, password, salt, iterationCount); - derive_key_ripemd160 (bNoTest, (char *) password.DataPtr(), (int) password.Size(), (char *) salt.Get(), (int) salt.Size(), iterationCount, (char *) key.Get(), (int) key.Size()); + derive_key_ripemd160 (bNotTest, (char *) password.DataPtr(), (int) password.Size(), (char *) salt.Get(), (int) salt.Size(), iterationCount, (char *) key.Get(), (int) key.Size()); } void Pkcs5HmacRipemd160_1000::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount, BOOL bNotTest) const { ValidateParameters (key, password, salt, iterationCount); - derive_key_ripemd160 (bNoTest, (char *) password.DataPtr(), (int) password.Size(), (char *) salt.Get(), (int) salt.Size(), iterationCount, (char *) key.Get(), (int) key.Size()); + derive_key_ripemd160 (bNotTest, (char *) password.DataPtr(), (int) password.Size(), (char *) salt.Get(), (int) salt.Size(), iterationCount, (char *) key.Get(), (int) key.Size()); } void Pkcs5HmacSha1::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount, BOOL bNotTest) const |