@@ -893,14 +893,13 @@
 
 - (void)XMPP_handleSASL: (OFXMLElement *)element
 {
 	if ([[element name] isEqual: @"challenge"]) {
 		OFXMLElement *responseTag;
-		OFDataArray *challenge = [OFDataArray
-		    dataArrayWithBase64EncodedString: [element stringValue]];
-		OFDataArray *response = [_authModule
-		    continueWithData: challenge];
+		OFData *challenge =
+		    [OFData dataWithBase64EncodedString: [element stringValue]];
+		OFData *response = [_authModule continueWithData: challenge];
 
 		responseTag = [OFXMLElement elementWithName: @"response"
 						  namespace: XMPP_NS_SASL];
 		if (response) {
 			if ([response count] == 0)
@@ -913,12 +912,12 @@
 		[self sendStanza: responseTag];
 		return;
 	}
 
 	if ([[element name] isEqual: @"success"]) {
-		[_authModule continueWithData: [OFDataArray
-		    dataArrayWithBase64EncodedString: [element stringValue]]];
+		[_authModule continueWithData: [OFData
+		    dataWithBase64EncodedString: [element stringValue]]];
 
 		[_delegates broadcastSelector: @selector(
 						   connectionWasAuthenticated:)
 				   withObject: self];
 
@@ -1076,11 +1075,11 @@
 }
 
 - (void)XMPP_sendAuth: (OFString *)authName
 {
 	OFXMLElement *authTag;
-	OFDataArray *initialMessage = [_authModule initialMessage];
+	OFData *initialMessage = [_authModule initialMessage];
 
 	authTag = [OFXMLElement elementWithName: @"auth"
 				      namespace: XMPP_NS_SASL];
 	[authTag addAttributeWithName: @"mechanism"
 			  stringValue: authName];