extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-08-12 15:17:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix cipher initialization

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@110 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough
2013-06-22 21:00:05 +00:00
parent c44b208078
commit 1e6b715380
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cipher/CipherV1.cpp
View File

@ -358,8 +358,9 @@ CipherKey CipherV1::newKey(const char *password, int passwdLength,
{
LOG(ERROR) << "openssl error, PBKDF2 failed";
return CipherKey();
} else
} else {
*iterationCount = res;
}
} else
{
// known iteration length
@ -574,7 +575,6 @@ int CipherV1::keySize() const
int CipherV1::cipherBlockSize() const
{
rAssert( _keySet );
return _blockCipher->blockSize();
}