From f4cd48aea180d6aa1abb4c4f058517bc9a40678e Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Tue, 18 Jun 2013 05:28:02 +0000 Subject: [PATCH] fix bad logging tests git-svn-id: http://encfs.googlecode.com/svn/trunk@104 db9cf616-1c43-0410-9cb8-a902689de0d6 --- cipher/CipherV1.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cipher/CipherV1.cpp b/cipher/CipherV1.cpp index 92b471d..a6070e7 100644 --- a/cipher/CipherV1.cpp +++ b/cipher/CipherV1.cpp @@ -297,8 +297,6 @@ bool CipherV1::initCiphers(const Interface &iface, const Interface &realIface, else _keySize = keyRange.closest(keyLength) / 8; - LOG_IF(ERROR, _keySize == 0) << "invalid key size"; - _pbkdf.reset(PBKDF::GetRegistry().CreateForMatch( NAME_PBKDF2_HMAC_SHA1)); if (!_pbkdf) { @@ -407,7 +405,7 @@ bool CipherV1::pseudoRandomize( byte *buf, int len ) bool CipherV1::setKey(const CipherKey &keyIv) { Lock l(_hmacMutex); - LOG_IF(ERROR, (int)_keySize != keyIv.size()) + LOG_IF(ERROR, (int)_keySize + _ivLength != keyIv.size()) << "Mismatched key size: passed " << keyIv.size() << ", expecting " << _keySize;