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

Adjust to recent ObjFW changes.

Browse source
This commit is contained in:
Jonathan Schleifer 2011-09-23 01:38:03 +02:00
parent 74727c159c
commit df5e8f04b4
8 changed files with 139 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/XMPPSCRAMAuth.m
View file

@ -231,9 +231,10 @@
if ([comp hasPrefix: @"r="]) {
if (![entry hasPrefix: cNonce])
@throw [XMPPAuthFailedException
newWithClass: isa
connection: nil
reason: @"Received wrong nonce"];
exceptionWithClass: isa
connection: nil
reason: @"Received wrong "
@"nonce"];
sNonce = entry;
got |= GOT_SNONCE;
@ -248,7 +249,7 @@
}
if (got != (GOT_SNONCE | GOT_SALT | GOT_ITERCOUNT))
@throw [OFInvalidServerReplyException newWithClass: isa];
@throw [OFInvalidServerReplyException exceptionWithClass: isa];
// Add c=<base64(GS2Header+channelBindingData)>
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
@ -389,14 +390,15 @@
if ([mess hasPrefix: @"v="]) {
if (![value isEqual: [serverSignature stringByBase64Encoding]])
@throw [XMPPAuthFailedException
newWithClass: isa
connection: nil
reason: @"Received wrong ServerSignature"];
exceptionWithClass: isa
connection: nil
reason: @"Received wrong "
@"ServerSignature"];
authenticated = YES;
} else
@throw [XMPPAuthFailedException newWithClass: isa
connection: nil
reason: value];
@throw [XMPPAuthFailedException exceptionWithClass: isa
connection: nil
reason: value];
return nil;
}