Adjust to ObjFW changes
This commit is contained in:
parent
1cf318f91e
commit
091cdac2b2
5 changed files with 11 additions and 6 deletions
|
@ -87,7 +87,7 @@
|
|||
XMPPDiscoIdentity *identity;
|
||||
OFString *feature;
|
||||
OFMutableString *caps = [OFMutableString string];
|
||||
OFSHA1Hash *hash = [OFSHA1Hash hash];
|
||||
OFSHA1Hash *hash = [OFSHA1Hash cryptoHash];
|
||||
OFDataArray *digest = [OFDataArray dataArray];
|
||||
|
||||
enumerator = [_identities objectEnumerator];
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
#import "XMPPPresence.h"
|
||||
#import "namespaces.h"
|
||||
|
||||
|
|
|
@ -201,7 +201,7 @@
|
|||
size_t i;
|
||||
const uint8_t *clientKey, *serverKey, *clientSignature;
|
||||
intmax_t iterCount = 0;
|
||||
id <OFHash> hash;
|
||||
id <OFCryptoHash> hash;
|
||||
OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword;
|
||||
OFString *tmpString, *sNonce = nil;
|
||||
OFEnumerator *enumerator;
|
||||
|
@ -426,7 +426,7 @@
|
|||
OFDataArray *k = [OFDataArray dataArray];
|
||||
size_t i, kSize, blockSize = [_hashType blockSize];
|
||||
uint8_t *kI = NULL, *kO = NULL;
|
||||
id <OFHash> hashI, hashO;
|
||||
id <OFCryptoHash> hashI, hashO;
|
||||
|
||||
if ([key itemSize] * [key count] > blockSize) {
|
||||
hashI = [[[_hashType alloc] init] autorelease];
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <assert.h>
|
||||
|
@ -37,7 +38,7 @@
|
|||
|
||||
#import "XMPPSRVLookup.h"
|
||||
|
||||
#import <ObjFW/OFSystemInfo.h>
|
||||
#import <ObjFW/OFLocalization.h>
|
||||
|
||||
@implementation XMPPSRVEntry
|
||||
@synthesize priority = _priority, weight = _weight;
|
||||
|
@ -115,7 +116,7 @@
|
|||
|
||||
_target = [[OFString alloc]
|
||||
initWithCString: buffer
|
||||
encoding: [OFSystemInfo native8BitEncoding]];
|
||||
encoding: [OFLocalization encoding]];
|
||||
} @catch (id e) {
|
||||
[self release];
|
||||
@throw e;
|
||||
|
@ -192,7 +193,7 @@
|
|||
|
||||
answer = [self allocMemoryWithSize: pageSize];
|
||||
answerLen = res_nsearch(&_resState, [request
|
||||
cStringWithEncoding: [OFSystemInfo native8BitEncoding]],
|
||||
cStringWithEncoding: [OFLocalization encoding]],
|
||||
ns_c_in, ns_t_srv, answer, (int)pageSize);
|
||||
|
||||
if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) ||
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
#import "XMPPStreamManagement.h"
|
||||
#import "namespaces.h"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue