ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename XMPPAuthenticator functions

Browse source
This commit is contained in:
Florian Zeitz 2011-02-24 22:44:51 +01:00
parent a97bd9c3a6
commit ba13fa3e3a
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/XMPPAuthenticator.h
View file

@ -65,13 +65,13 @@
/** /**
* \return A OFDataAray containing the initial authentication message * \return A OFDataAray containing the initial authentication message
*/ */
- (OFDataArray*)getClientFirstMessage; - (OFDataArray*)clientFirstMessage;
/** /**
* \param challenge The challenge to generate a response for * \param challenge The challenge to generate a response for
* \return The response to the given challenge * \return The response to the given challenge
*/ */
- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge; - (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge;
/** /**
* Checks whether the servers final message was valid * Checks whether the servers final message was valid

4
src/XMPPAuthenticator.m
View file

@ -57,13 +57,13 @@
[super dealloc]; [super dealloc];
} }
- (OFDataArray*)getClientFirstMessage - (OFDataArray*)clientFirstMessage
{ {
@throw [OFNotImplementedException newWithClass: isa @throw [OFNotImplementedException newWithClass: isa
selector: _cmd]; selector: _cmd];
} }
- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge - (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
{ {
@throw [OFNotImplementedException newWithClass: isa @throw [OFNotImplementedException newWithClass: isa
selector: _cmd]; selector: _cmd];

5
src/XMPPConnection.m
View file

@ -235,7 +235,7 @@
[authTag addAttributeWithName: @"mechanism" [authTag addAttributeWithName: @"mechanism"
stringValue: name]; stringValue: name];
[authTag addChild: [OFXMLElement elementWithCharacters: [authTag addChild: [OFXMLElement elementWithCharacters:
[[authModule getClientFirstMessage] stringByBase64Encoding]]]; [[authModule clientFirstMessage] stringByBase64Encoding]]];
[self sendStanza: authTag]; [self sendStanza: authTag];
} }
@ -314,7 +314,8 @@
[OFDataArray dataArrayWithBase64EncodedString: [OFDataArray dataArrayWithBase64EncodedString:
[elem.children.firstObject stringValue]]; [elem.children.firstObject stringValue]];
OFDataArray *response = OFDataArray *response =
[authModule getResponseWithChallenge: challenge]; [authModule
calculateResponseWithChallenge: challenge];
responseTag = [OFXMLElement elementWithName: @"response" responseTag = [OFXMLElement elementWithName: @"response"
namespace: NS_SASL]; namespace: NS_SASL];

4
src/XMPPPLAINAuth.m
View file

@ -40,7 +40,7 @@
password: password] autorelease]; password: password] autorelease];
} }
- (OFDataArray*)getClientFirstMessage - (OFDataArray*)clientFirstMessage
{ {
OFDataArray *message = [OFDataArray dataArrayWithItemSize: 1]; OFDataArray *message = [OFDataArray dataArrayWithItemSize: 1];
/* authzid */ /* authzid */
@ -60,7 +60,7 @@
return message; return message;
} }
- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge - (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
{ {
@throw [XMPPAuthFailedException @throw [XMPPAuthFailedException
newWithClass: isa newWithClass: isa

4
src/XMPPSCRAMAuth.m
View file

@ -257,7 +257,7 @@
} }
} }
- (OFDataArray*)getClientFirstMessage - (OFDataArray*)clientFirstMessage
{ {
OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1]; OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1];
[GS2Header release]; [GS2Header release];
@ -282,7 +282,7 @@
return ret; return ret;
} }
- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge - (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
{ {
size_t i; size_t i;
uint8_t *clientKey, *serverKey, *clientSignature; uint8_t *clientKey, *serverKey, *clientSignature;