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

Adjust to ObjFW changes

Browse source
This commit is contained in:
Jonathan Schleifer 2017-01-22 00:49:14 +01:00
parent 1cf318f91e
commit 091cdac2b2
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
5 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/XMPPDiscoEntity.m
View file

@ -87,7 +87,7 @@
XMPPDiscoIdentity *identity; XMPPDiscoIdentity *identity;
OFString *feature; OFString *feature;
OFMutableString *caps = [OFMutableString string]; OFMutableString *caps = [OFMutableString string];
OFSHA1Hash *hash = [OFSHA1Hash hash]; OFSHA1Hash *hash = [OFSHA1Hash cryptoHash];
OFDataArray *digest = [OFDataArray dataArray]; OFDataArray *digest = [OFDataArray dataArray];
enumerator = [_identities objectEnumerator]; enumerator = [_identities objectEnumerator];

2
src/XMPPPresence.m
View file

@ -25,6 +25,8 @@
# include "config.h" # include "config.h"
#endif #endif
#include <inttypes.h>
#import "XMPPPresence.h" #import "XMPPPresence.h"
#import "namespaces.h" #import "namespaces.h"

4
src/XMPPSCRAMAuth.m
View file

@ -201,7 +201,7 @@
size_t i; size_t i;
const uint8_t *clientKey, *serverKey, *clientSignature; const uint8_t *clientKey, *serverKey, *clientSignature;
intmax_t iterCount = 0; intmax_t iterCount = 0;
id <OFHash> hash; id <OFCryptoHash> hash;
OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword; OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword;
OFString *tmpString, *sNonce = nil; OFString *tmpString, *sNonce = nil;
OFEnumerator *enumerator; OFEnumerator *enumerator;
@ -426,7 +426,7 @@
OFDataArray *k = [OFDataArray dataArray]; OFDataArray *k = [OFDataArray dataArray];
size_t i, kSize, blockSize = [_hashType blockSize]; size_t i, kSize, blockSize = [_hashType blockSize];
uint8_t *kI = NULL, *kO = NULL; uint8_t *kI = NULL, *kO = NULL;
id <OFHash> hashI, hashO; id <OFCryptoHash> hashI, hashO;
if ([key itemSize] * [key count] > blockSize) { if ([key itemSize] * [key count] > blockSize) {
hashI = [[[_hashType alloc] init] autorelease]; hashI = [[[_hashType alloc] init] autorelease];

7
src/XMPPSRVLookup.m
View file

@ -26,6 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <inttypes.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
@ -37,7 +38,7 @@
#import "XMPPSRVLookup.h" #import "XMPPSRVLookup.h"
#import <ObjFW/OFSystemInfo.h> #import <ObjFW/OFLocalization.h>
@implementation XMPPSRVEntry @implementation XMPPSRVEntry
@synthesize priority = _priority, weight = _weight; @synthesize priority = _priority, weight = _weight;
@ -115,7 +116,7 @@
_target = [[OFString alloc] _target = [[OFString alloc]
initWithCString: buffer initWithCString: buffer
encoding: [OFSystemInfo native8BitEncoding]]; encoding: [OFLocalization encoding]];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -192,7 +193,7 @@
answer = [self allocMemoryWithSize: pageSize]; answer = [self allocMemoryWithSize: pageSize];
answerLen = res_nsearch(&_resState, [request answerLen = res_nsearch(&_resState, [request
cStringWithEncoding: [OFSystemInfo native8BitEncoding]], cStringWithEncoding: [OFLocalization encoding]],
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) ||

2
src/XMPPStreamManagement.m
View file

@ -20,6 +20,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <inttypes.h>
#import "XMPPStreamManagement.h" #import "XMPPStreamManagement.h"
#import "namespaces.h" #import "namespaces.h"