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

Adapt to ObjFW changes

Browse source
This commit is contained in:
Florian Zeitz 2014-02-03 23:33:35 +01:00
parent d736c927f1
commit 358334a778
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/XMPPSCRAMAuth.h
View file

@ -112,7 +112,7 @@
/// \cond internal /// \cond internal
- (OFString*)XMPP_genNonce; - (OFString*)XMPP_genNonce;
- (uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key - (const uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
data: (OFDataArray*)data; data: (OFDataArray*)data;
- (OFDataArray*)XMPP_hiWithData: (OFDataArray*)str - (OFDataArray*)XMPP_hiWithData: (OFDataArray*)str
salt: (OFDataArray*)salt salt: (OFDataArray*)salt

7
src/XMPPSCRAMAuth.m
View file

@ -199,7 +199,7 @@
- (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data - (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data
{ {
size_t i; size_t i;
uint8_t *clientKey, *serverKey, *clientSignature; const uint8_t *clientKey, *serverKey, *clientSignature;
intmax_t iterCount = 0; intmax_t iterCount = 0;
id <OFHash> hash; id <OFHash> hash;
OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword; OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword;
@ -419,7 +419,7 @@
length: 64]; length: 64];
} }
- (uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key - (const uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
data: (OFDataArray*)data data: (OFDataArray*)data
{ {
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
@ -480,7 +480,8 @@
{ {
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
size_t digestSize = [_hashType digestSize]; size_t digestSize = [_hashType digestSize];
uint8_t *result = NULL, *u, *uOld; uint8_t *result = NULL;
const uint8_t *u, *uOld;
intmax_t j, k; intmax_t j, k;
OFDataArray *salty, *tmp, *ret; OFDataArray *salty, *tmp, *ret;

4
src/XMPPSRVLookup.m
View file

@ -108,7 +108,7 @@
_target = [[OFString alloc] _target = [[OFString alloc]
initWithCString: buffer initWithCString: buffer
encoding: OF_STRING_ENCODING_NATIVE]; encoding: [OFString nativeOSEncoding]];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -218,7 +218,7 @@
answer = [self allocMemoryWithSize: pageSize]; answer = [self allocMemoryWithSize: pageSize];
answerLen = res_nsearch(&_resState, answerLen = res_nsearch(&_resState,
[request cStringWithEncoding: OF_STRING_ENCODING_NATIVE], [request cStringWithEncoding: [OFString nativeOSEncoding]],
ns_c_in, ns_t_srv, answer, (int)pageSize); ns_c_in, ns_t_srv, answer, (int)pageSize);
if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) || if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) ||