@@ -143,11 +143,11 @@
 	[old release];
 }
 
 - (OFDataArray*)initialMessage
 {
-	OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1];
+	OFDataArray *ret = [OFDataArray dataArray];
 
 	/* New authentication attempt, reset status */
 	[cNonce release];
 	cNonce = nil;
 	[GS2Header release];
@@ -213,12 +213,12 @@
 		GOT_SALT      = 0x02,
 		GOT_ITERCOUNT = 0x04
 	} got = 0;
 
 	hash = [[[hashType alloc] init] autorelease];
-	ret = [OFDataArray dataArrayWithItemSize: 1];
-	authMessage = [OFDataArray dataArrayWithItemSize: 1];
+	ret = [OFDataArray dataArray];
+	authMessage = [OFDataArray dataArray];
 
 	OFString *chal = [OFString stringWithUTF8String: [data cArray]
 						 length: [data count] *
 							 [data itemSize]];
 
@@ -250,11 +250,11 @@
 
 	if (got != (GOT_SNONCE | GOT_SALT | GOT_ITERCOUNT))
 		@throw [OFInvalidServerReplyException exceptionWithClass: isa];
 
 	// Add c=<base64(GS2Header+channelBindingData)>
-	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
+	tmpArray = [OFDataArray dataArray];
 	[tmpArray addNItems: [GS2Header UTF8StringLength]
 		 fromCArray: [GS2Header UTF8String]];
 	if (plusAvailable && [connection encrypted]) {
 		OFDataArray *channelBinding = [((SSLSocket*)[connection socket])
 		    channelBindingDataWithType: @"tls-unique"];
@@ -276,11 +276,11 @@
 
 	/*
 	 * IETF RFC 5802:
 	 * SaltedPassword := Hi(Normalize(password), salt, i)
 	 */
-	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
+	tmpArray = [OFDataArray dataArray];
 	[tmpArray addNItems: [password UTF8StringLength]
 		 fromCArray: [password UTF8String]];
 
 	saltedPassword = [self XMPP_hiWithData: tmpArray
 					  salt: salt
@@ -303,11 +303,11 @@
 
 	/*
 	 * IETF RFC 5802:
 	 * ClientKey := HMAC(SaltedPassword, "Client Key")
 	 */
-	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
+	tmpArray = [OFDataArray dataArray];
 	[tmpArray addNItems: 10
 		 fromCArray: "Client Key"];
 	clientKey = [self XMPP_HMACWithKey: saltedPassword
 				      data: tmpArray];
 
@@ -315,11 +315,11 @@
 	 * IETF RFC 5802:
 	 * StoredKey := H(ClientKey)
 	 */
 	[hash updateWithBuffer: (void*) clientKey
 			length: [hashType digestSize]];
-	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
+	tmpArray = [OFDataArray dataArray];
 	[tmpArray addNItems: [hashType digestSize]
 		 fromCArray: [hash digest]];
 
 	/*
 	 * IETF RFC 5802:
@@ -330,33 +330,33 @@
 
 	/*
 	 * IETF RFC 5802:
 	 * ServerKey := HMAC(SaltedPassword, "Server Key")
 	 */
-	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
+	tmpArray = [OFDataArray dataArray];
 	[tmpArray addNItems: 10
 		 fromCArray: "Server Key"];
 	serverKey = [self XMPP_HMACWithKey: saltedPassword
 				      data: tmpArray];
 
 	/*
 	 * IETF RFC 5802:
 	 * ServerSignature := HMAC(ServerKey, AuthMessage)
 	 */
-	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
+	tmpArray = [OFDataArray dataArray];
 	[tmpArray addNItems: [hashType digestSize]
 		 fromCArray: serverKey];
-	serverSignature = [[OFDataArray alloc] initWithItemSize: 1];
+	serverSignature = [[OFDataArray alloc] init];
 	[serverSignature addNItems: [hashType digestSize]
 			fromCArray: [self XMPP_HMACWithKey: tmpArray
 						      data: authMessage]];
 
 	/*
 	 * IETF RFC 5802:
 	 * ClientProof := ClientKey XOR ClientSignature
 	 */
-	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
+	tmpArray = [OFDataArray dataArray];
 	for (i = 0; i < [hashType digestSize]; i++) {
 		uint8_t c = clientKey[i] ^ clientSignature[i];
 		[tmpArray addItem: &c];
 	}
 
@@ -426,11 +426,11 @@
 
 - (uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
 			data: (OFDataArray*)data
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	OFDataArray *k = [OFDataArray dataArrayWithItemSize: 1];
+	OFDataArray *k = [OFDataArray dataArray];
 	size_t i, kSize, blockSize = [hashType blockSize];
 	uint8_t *kI = NULL, *kO = NULL;
 	OFHash *hashI, *hashO;
 
 	if ([key itemSize] * [key count] > blockSize) {
@@ -503,11 +503,11 @@
 
 		for (j = 0; j < digestSize; j++)
 			result[j] ^= uOld[j];
 
 		for (j = 0; j < i - 1; j++) {
-			tmp = [OFDataArray dataArrayWithItemSize: 1];
+			tmp = [OFDataArray dataArray];
 			[tmp addNItems: digestSize
 			    fromCArray: uOld];
 
 			u = [self XMPP_HMACWithKey: str
 					      data: tmp];
@@ -518,11 +518,11 @@
 			uOld = u;
 
 			[pool releaseObjects];
 		}
 
-		ret = [OFDataArray dataArrayWithItemSize: 1];
+		ret = [OFDataArray dataArray];
 		[ret addNItems: digestSize
 		    fromCArray: result];
 	} @finally {
 		[self freeMemory: result];
 	}