From ba13fa3e3a06b2e7c51e61854687ac8a020e05eb Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Thu, 24 Feb 2011 22:44:51 +0100
Subject: [PATCH] Rename XMPPAuthenticator functions

---
 src/XMPPAuthenticator.h | 4 ++--
 src/XMPPAuthenticator.m | 4 ++--
 src/XMPPConnection.m    | 5 +++--
 src/XMPPPLAINAuth.m     | 4 ++--
 src/XMPPSCRAMAuth.m     | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/XMPPAuthenticator.h b/src/XMPPAuthenticator.h
index 27d2318..4323838 100644
--- a/src/XMPPAuthenticator.h
+++ b/src/XMPPAuthenticator.h
@@ -65,13 +65,13 @@
 /**
  * \return A OFDataAray containing the initial authentication message
  */
-- (OFDataArray*)getClientFirstMessage;
+- (OFDataArray*)clientFirstMessage;
 
 /**
  * \param challenge The challenge to generate a response for
  * \return The response to the given challenge
  */
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge;
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge;
 
 /**
  * Checks whether the servers final message was valid
diff --git a/src/XMPPAuthenticator.m b/src/XMPPAuthenticator.m
index 308204b..1411aaa 100644
--- a/src/XMPPAuthenticator.m
+++ b/src/XMPPAuthenticator.m
@@ -57,13 +57,13 @@
 	[super dealloc];
 }
 
-- (OFDataArray*)getClientFirstMessage
+- (OFDataArray*)clientFirstMessage
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
diff --git a/src/XMPPConnection.m b/src/XMPPConnection.m
index 68d0d71..5d57ebc 100644
--- a/src/XMPPConnection.m
+++ b/src/XMPPConnection.m
@@ -235,7 +235,7 @@
 	[authTag addAttributeWithName: @"mechanism"
 			  stringValue: name];
 	[authTag addChild: [OFXMLElement elementWithCharacters:
-	    [[authModule getClientFirstMessage] stringByBase64Encoding]]];
+	    [[authModule clientFirstMessage] stringByBase64Encoding]]];
 
 	[self sendStanza: authTag];
 }
@@ -314,7 +314,8 @@
 			    [OFDataArray dataArrayWithBase64EncodedString:
 				[elem.children.firstObject stringValue]];
 			OFDataArray *response =
-			    [authModule getResponseWithChallenge: challenge];
+			    [authModule
+			        calculateResponseWithChallenge: challenge];
 
 			responseTag = [OFXMLElement elementWithName: @"response"
 							  namespace: NS_SASL];
diff --git a/src/XMPPPLAINAuth.m b/src/XMPPPLAINAuth.m
index 2c35c24..cf84579 100644
--- a/src/XMPPPLAINAuth.m
+++ b/src/XMPPPLAINAuth.m
@@ -40,7 +40,7 @@
 				    password: password] autorelease];
 }
 
-- (OFDataArray*)getClientFirstMessage
+- (OFDataArray*)clientFirstMessage
 {
 	OFDataArray *message = [OFDataArray dataArrayWithItemSize: 1];
 	/* authzid */
@@ -60,7 +60,7 @@
 	return message;
 }
 
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
 {
 	@throw [XMPPAuthFailedException
 	    newWithClass: isa
diff --git a/src/XMPPSCRAMAuth.m b/src/XMPPSCRAMAuth.m
index 5963c52..febc1ea 100644
--- a/src/XMPPSCRAMAuth.m
+++ b/src/XMPPSCRAMAuth.m
@@ -257,7 +257,7 @@
 	}
 }
 
-- (OFDataArray*)getClientFirstMessage
+- (OFDataArray*)clientFirstMessage
 {
 	OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1];
 	[GS2Header release];
@@ -282,7 +282,7 @@
 	return ret;
 }
 
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
 {
 	size_t i;
 	uint8_t *clientKey, *serverKey, *clientSignature;