@@ -60,12 +60,12 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	size_t blockSize = [_hashClass blockSize];
 	OFSecureData *outerKeyPad = [OFSecureData dataWithCount: blockSize];
 	OFSecureData *innerKeyPad = [OFSecureData dataWithCount: blockSize];
-	unsigned char *outerKeyPadItems = [outerKeyPad items];
-	unsigned char *innerKeyPadItems = [innerKeyPad items];
+	unsigned char *outerKeyPadItems = outerKeyPad.mutableItems;
+	unsigned char *innerKeyPadItems = innerKeyPad.mutableItems;
 
 	[_outerHash release];
 	[_innerHash release];
 	[_outerHashCopy release];
 	[_innerHashCopy release];
@@ -80,12 +80,12 @@
 
 			length = [_hashClass digestSize];
 			if OF_UNLIKELY (length > blockSize)
 				length = blockSize;
 
-			memcpy(outerKeyPadItems, [hash digest], length);
-			memcpy(innerKeyPadItems, [hash digest], length);
+			memcpy(outerKeyPadItems, hash.digest, length);
+			memcpy(innerKeyPadItems, hash.digest, length);
 		} else {
 			memcpy(outerKeyPadItems, key, length);
 			memcpy(innerKeyPadItems, key, length);
 		}
 
@@ -137,17 +137,17 @@
 {
 	if (_outerHash == nil || _innerHash == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if (_calculated)
-		return [_outerHash digest];
+		return _outerHash.digest;
 
-	[_outerHash updateWithBuffer: [_innerHash digest]
+	[_outerHash updateWithBuffer: _innerHash.digest
 			      length: [_hashClass digestSize]];
 	_calculated = true;
 
-	return [_outerHash digest];
+	return _outerHash.digest;
 }
 
 - (size_t)digestSize
 {
 	return [_hashClass digestSize];