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-08-04 18:59:01 +02:00
parent b9f214e320
commit a85826c6ce
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/XMPPJID.m
View file

@ -58,18 +58,17 @@
if (nodesep == SIZE_MAX) if (nodesep == SIZE_MAX)
[self setNode: nil]; [self setNode: nil];
else else
[self setNode: [str substringFromIndex: 0 [self setNode: [str substringWithRange: of_range(0, nodesep)]];
toIndex: nodesep]];
if (resourcesep == SIZE_MAX) { if (resourcesep == SIZE_MAX) {
[self setResource: nil]; [self setResource: nil];
resourcesep = [str length]; resourcesep = [str length];
} else } else
[self setResource: [str substringFromIndex: resourcesep + 1 [self setResource: [str substringWithRange:
toIndex: [str length]]]; of_range(resourcesep + 1, [str length] - resourcesep - 1)]];
[self setDomain: [str substringFromIndex: nodesep + 1 [self setDomain: [str substringWithRange:
toIndex: resourcesep]]; of_range(nodesep + 1, resourcesep - nodesep - 1)]];
return self; return self;
} }

8
src/XMPPSCRAMAuth.m
View file

@ -184,8 +184,8 @@
enumerator = enumerator =
[[chal componentsSeparatedByString: @","] objectEnumerator]; [[chal componentsSeparatedByString: @","] objectEnumerator];
while ((comp = [enumerator nextObject]) != nil) { while ((comp = [enumerator nextObject]) != nil) {
OFString *entry = [comp substringFromIndex: 2 OFString *entry = [comp substringWithRange:
toIndex: [comp length]]; of_range(2, [comp length] - 2)];
if ([comp hasPrefix: @"r="]) { if ([comp hasPrefix: @"r="]) {
if (![entry hasPrefix: cNonce]) if (![entry hasPrefix: cNonce])
@ -333,8 +333,8 @@
OFString *mess = [OFString stringWithCString: [message cArray] OFString *mess = [OFString stringWithCString: [message cArray]
length: [message count] * length: [message count] *
[message itemSize]]; [message itemSize]];
OFString *value = [mess substringFromIndex: 2 OFString *value = [mess substringWithRange:
toIndex: [mess length]]; of_range(2, [mess length] - 2)];
if ([mess hasPrefix: @"v="]) { if ([mess hasPrefix: @"v="]) {
if (![value isEqual: [serverSignature stringByBase64Encoding]]) if (![value isEqual: [serverSignature stringByBase64Encoding]])