@@ -57,11 +57,11 @@
 		    dataWithCount: param.saltLength + 4
 	    allowsSwappableMemory: param.allowsSwappableMemory];
 	extendedSaltItems = extendedSalt.mutableItems;
 
 	@try {
-		uint32_t i = OF_BSWAP32_IF_LE(1);
+		uint32_t i = OFToBigEndian32(1);
 
 		[param.HMAC setKey: param.password
 			    length: param.passwordLength];
 
 		memcpy(extendedSaltItems, param.salt, param.saltLength);
@@ -94,11 +94,11 @@
 
 			memcpy(param.key, bufferItems, length);
 			param.key += length;
 			param.keyLength -= length;
 
-			i = OF_BSWAP32_IF_LE(OF_BSWAP32_IF_LE(i) + 1);
+			i = OFToBigEndian32(OFFromBigEndian32(i) + 1);
 		}
 	} @catch (id e) {
 		[extendedSalt zero];
 		[buffer zero];
 		[digest zero];