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

fix bad logging tests

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@104 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2013-06-18 05:28:02 +00:00
parent 3a34db8ce4
commit f4cd48aea1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cipher/CipherV1.cpp
View File

@ -297,8 +297,6 @@ bool CipherV1::initCiphers(const Interface &iface, const Interface &realIface,
else else
_keySize = keyRange.closest(keyLength) / 8; _keySize = keyRange.closest(keyLength) / 8;
LOG_IF(ERROR, _keySize == 0) << "invalid key size";
_pbkdf.reset(PBKDF::GetRegistry().CreateForMatch( _pbkdf.reset(PBKDF::GetRegistry().CreateForMatch(
NAME_PBKDF2_HMAC_SHA1)); NAME_PBKDF2_HMAC_SHA1));
if (!_pbkdf) { if (!_pbkdf) {
@ -407,7 +405,7 @@ bool CipherV1::pseudoRandomize( byte *buf, int len )
bool CipherV1::setKey(const CipherKey &keyIv) { bool CipherV1::setKey(const CipherKey &keyIv) {
Lock l(_hmacMutex); Lock l(_hmacMutex);
LOG_IF(ERROR, (int)_keySize != keyIv.size()) LOG_IF(ERROR, (int)_keySize + _ivLength != keyIv.size())
<< "Mismatched key size: passed " << "Mismatched key size: passed "
<< keyIv.size() << ", expecting " << _keySize; << keyIv.size() << ", expecting " << _keySize;