@@ -76,11 +76,11 @@
 			id <OFCryptoHash> hash = [_hashClass cryptoHash];
 
 			[hash updateWithBuffer: key
 					length: length];
 
-			length = [_hashClass digestSize];
+			length = hash.digestSize;
 			if OF_UNLIKELY (length > blockSize)
 				length = blockSize;
 
 			memcpy(outerKeyPadItems, hash.digest, length);
 			memcpy(innerKeyPadItems, hash.digest, length);
@@ -140,11 +140,11 @@
 
 	if (_calculated)
 		return _outerHash.digest;
 
 	[_outerHash updateWithBuffer: _innerHash.digest
-			      length: [_hashClass digestSize]];
+			      length: _innerHash.digestSize];
 	_calculated = true;
 
 	return _outerHash.digest;
 }