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

Adjust to ObjFW changes & small fixes

Browse source
This commit is contained in:
Jonathan Schleifer 2017-07-23 13:19:48 +02:00
parent 5fa8b0b9b3
commit cb5f6bfe40
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
12 changed files with 98 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/XMPPAuthenticator.h
View file

@ -65,11 +65,11 @@ OF_ASSUME_NONNULL_BEGIN
password: (nullable OFString *)password OF_DESIGNATED_INITIALIZER;
/**
* \brief Returns an OFDataArray containing the initial authentication message.
* \brief Returns OFData containing the initial authentication message.
*
* \return An OFDataAray containing the initial authentication message
*/
- (OFDataArray *)initialMessage;
- (nullable OFData *)initialMessage;
/**
* \brief Continue authentication with the specified data.
@ -77,7 +77,7 @@ OF_ASSUME_NONNULL_BEGIN
* \param data The continuation data send by the server
* \return The appropriate response if the data was a challenge, nil otherwise
*/
- (nullable OFDataArray *)continueWithData: (OFDataArray *)data;
- (nullable OFData *)continueWithData: (OFData *)data;
@end
OF_ASSUME_NONNULL_END

4
src/XMPPAuthenticator.m
View file

@ -65,12 +65,12 @@
[super dealloc];
}
- (OFDataArray *)initialMessage
- (OFData *)initialMessage
{
return nil;
}
- (OFDataArray *)continueWithData: (OFDataArray *)challenge
- (OFData *)continueWithData: (OFData *)challenge
{
return nil;
}

13
src/XMPPConnection.m
View file

@ -895,10 +895,9 @@ OF_ASSUME_NONNULL_END
{
if ([[element name] isEqual: @"challenge"]) {
OFXMLElement *responseTag;
OFDataArray *challenge = [OFDataArray
dataArrayWithBase64EncodedString: [element stringValue]];
OFDataArray *response = [_authModule
continueWithData: challenge];
OFData *challenge =
[OFData dataWithBase64EncodedString: [element stringValue]];
OFData *response = [_authModule continueWithData: challenge];
responseTag = [OFXMLElement elementWithName: @"response"
namespace: XMPP_NS_SASL];
@ -915,8 +914,8 @@ OF_ASSUME_NONNULL_END
}
if ([[element name] isEqual: @"success"]) {
[_authModule continueWithData: [OFDataArray
dataArrayWithBase64EncodedString: [element stringValue]]];
[_authModule continueWithData: [OFData
dataWithBase64EncodedString: [element stringValue]]];
[_delegates broadcastSelector: @selector(
connectionWasAuthenticated:)
@ -1078,7 +1077,7 @@ OF_ASSUME_NONNULL_END
- (void)XMPP_sendAuth: (OFString *)authName
{
OFXMLElement *authTag;
OFDataArray *initialMessage = [_authModule initialMessage];
OFData *initialMessage = [_authModule initialMessage];
authTag = [OFXMLElement elementWithName: @"auth"
namespace: XMPP_NS_SASL];

6
src/XMPPDiscoEntity.m
View file

@ -98,7 +98,7 @@
OFString *feature;
OFMutableString *caps = [OFMutableString string];
OFSHA1Hash *hash = [OFSHA1Hash cryptoHash];
OFDataArray *digest = [OFDataArray dataArray];
OFData *digest;
enumerator = [_identities objectEnumerator];
while ((identity = [enumerator nextObject]) != nil)
@ -112,8 +112,8 @@
[hash updateWithBuffer: [caps UTF8String]
length: [caps UTF8StringLength]];
[digest addItems: [hash digest]
count: [OFSHA1Hash digestSize]];
digest = [OFData dataWithItems: [hash digest]
count: [[hash class] digestSize]];
return [digest stringByBase64Encoding];
}

11
src/XMPPEXTERNALAuth.m
View file

@ -40,13 +40,16 @@
password: nil] autorelease];
}
- (OFDataArray *)initialMessage
- (OFData *)initialMessage
{
OFDataArray *message = [OFDataArray dataArray];
OFMutableData *message = [OFMutableData data];
/* authzid */
if (_authzid)
[message addItem: _authzid];
if (_authzid != nil)
[message addItems: [_authzid UTF8String]
count: [_authzid UTF8StringLength]];
[message makeImmutable];
return message;
}

6
src/XMPPFileStorage.m
View file

@ -30,7 +30,7 @@
#import <ObjFW/OFArray.h>
#import <ObjFW/OFDictionary.h>
#import <ObjFW/OFNumber.h>
#import <ObjFW/OFDataArray.h>
#import <ObjFW/OFData.h>
#import <ObjFW/OFAutoreleasePool.h>
#import <ObjFW/OFNotImplementedException.h>
@ -52,8 +52,8 @@
_file = [file copy];
@try {
_data = [[[OFDataArray dataArrayWithContentsOfFile:
file] messagePackValue] retain];
_data = [[[OFData dataWithContentsOfFile: file]
messagePackValue] retain];
} @catch (id e) {
_data = [[OFMutableDictionary alloc] init];
}

4
src/XMPPMulticastDelegate.h
View file

@ -24,14 +24,14 @@
OF_ASSUME_NONNULL_BEGIN
@class OFDataArray;
@class OFMutableData;
/**
* \brief A class to provide multiple delegates in a single class
*/
@interface XMPPMulticastDelegate: OFObject
{
OFDataArray *_delegates;
OFMutableData *_delegates;
}
/**

15
src/XMPPMulticastDelegate.m
View file

@ -25,7 +25,7 @@
#endif
#import <ObjFW/ObjFW.h>
#import <ObjFW/OFDataArray.h>
#import <ObjFW/OFData.h>
#import "XMPPMulticastDelegate.h"
@ -35,7 +35,8 @@
self = [super init];
@try {
_delegates = [[OFDataArray alloc] initWithItemSize: sizeof(id)];
_delegates = [[OFMutableData alloc]
initWithItemSize: sizeof(id)];
} @catch (id e) {
[self release];
@throw e;
@ -73,7 +74,8 @@
- (bool)broadcastSelector: (SEL)selector
withObject: (id)object
{
OFDataArray *currentDelegates = [_delegates copy];
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFMutableData *currentDelegates = [[_delegates copy] autorelease];
id *items = [currentDelegates items];
size_t i, count = [currentDelegates count];
bool handled = false;
@ -90,6 +92,8 @@
handled |= imp(responder, selector, object);
}
[pool release];
return handled;
}
@ -97,7 +101,8 @@
withObject: (id)object1
withObject: (id)object2
{
OFDataArray *currentDelegates = [_delegates copy];
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFMutableData *currentDelegates = [[_delegates copy] autorelease];
id *items = [currentDelegates items];
size_t i, count = [currentDelegates count];
bool handled = false;
@ -114,6 +119,8 @@
handled |= imp(responder, selector, object1, object2);
}
[pool release];
return handled;
}
@end

11
src/XMPPPLAINAuth.m
View file

@ -44,13 +44,14 @@
password: password] autorelease];
}
- (OFDataArray *)initialMessage
- (OFData *)initialMessage
{
OFDataArray *message = [OFDataArray dataArray];
OFMutableData *message = [OFMutableData data];
/* authzid */
if (_authzid)
[message addItem: _authzid];
if (_authzid != nil)
[message addItems: [_authzid UTF8String]
count: [_authzid UTF8StringLength]];
/* separator */
[message addItem: ""];
@ -66,6 +67,8 @@
[message addItems: [_password UTF8String]
count: [_password UTF8StringLength]];
[message makeImmutable];
return message;
}
@end

2
src/XMPPSCRAMAuth.h
View file

@ -35,7 +35,7 @@ OF_ASSUME_NONNULL_BEGIN
OFString *_cNonce;
OFString *_GS2Header;
OFString *_clientFirstMessageBare;
OFDataArray *_serverSignature;
OFData *_serverSignature;
XMPPConnection *_connection;
bool _plusAvailable;
bool _authenticated;

108
src/XMPPSCRAMAuth.m
View file

@ -41,13 +41,13 @@ OF_ASSUME_NONNULL_BEGIN
@interface XMPPSCRAMAuth ()
- (OFString *)XMPP_genNonce;
- (const uint8_t *)XMPP_HMACWithKey: (OFDataArray *)key
data: (OFDataArray *)data;
- (OFDataArray *)XMPP_hiWithData: (OFDataArray *)str
salt: (OFDataArray *)salt
iterationCount: (intmax_t)i;
- (OFDataArray *)XMPP_parseServerFirstMessage: (OFDataArray *)data;
- (OFDataArray *)XMPP_parseServerFinalMessage: (OFDataArray *)data;
- (const uint8_t *)XMPP_HMACWithKey: (OFData *)key
data: (OFData *)data;
- (OFData *)XMPP_hiWithData: (OFData *)str
salt: (OFData *)salt
iterationCount: (intmax_t)i;
- (OFData *)XMPP_parseServerFirstMessage: (OFData *)data;
- (OFData *)XMPP_parseServerFinalMessage: (OFData *)data;
@end
OF_ASSUME_NONNULL_END
@ -158,9 +158,9 @@ OF_ASSUME_NONNULL_END
[old release];
}
- (OFDataArray *)initialMessage
- (OFData *)initialMessage
{
OFDataArray *ret = [OFDataArray dataArray];
OFMutableData *ret = [OFMutableData data];
/* New authentication attempt, reset status */
[_cNonce release];
@ -171,7 +171,7 @@ OF_ASSUME_NONNULL_END
_serverSignature = nil;
_authenticated = false;
if (_authzid)
if (_authzid != nil)
_GS2Header = [[OFString alloc]
initWithFormat: @"%@,a=%@,",
(_plusAvailable ? @"p=tls-unique" : @"y"),
@ -192,13 +192,15 @@ OF_ASSUME_NONNULL_END
[ret addItems: [_clientFirstMessageBare UTF8String]
count: [_clientFirstMessageBare UTF8StringLength]];
[ret makeImmutable];
return ret;
}
- (OFDataArray *)continueWithData: (OFDataArray *)data
- (OFData *)continueWithData: (OFData *)data
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFDataArray *ret;
OFData *ret;
if (!_serverSignature)
ret = [self XMPP_parseServerFirstMessage: data];
@ -211,13 +213,14 @@ OF_ASSUME_NONNULL_END
return [ret autorelease];
}
- (OFDataArray *)XMPP_parseServerFirstMessage: (OFDataArray *)data
- (OFData *)XMPP_parseServerFirstMessage: (OFData *)data
{
size_t i;
const uint8_t *clientKey, *serverKey, *clientSignature;
intmax_t iterCount = 0;
id <OFCryptoHash> hash;
OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword;
OFMutableData *ret, *authMessage, *tmpArray;
OFData *salt = nil, *saltedPassword;
OFString *tmpString, *sNonce = nil;
OFEnumerator *enumerator;
OFString *comp;
@ -228,8 +231,8 @@ OF_ASSUME_NONNULL_END
} got = 0;
hash = [[[_hashType alloc] init] autorelease];
ret = [OFDataArray dataArray];
authMessage = [OFDataArray dataArray];
ret = [OFMutableData data];
authMessage = [OFMutableData data];
OFString *chal = [OFString stringWithUTF8String: [data items]
length: [data count] *
@ -251,8 +254,7 @@ OF_ASSUME_NONNULL_END
sNonce = entry;
got |= GOT_SNONCE;
} else if ([comp hasPrefix: @"s="]) {
salt = [OFDataArray
dataArrayWithBase64EncodedString: entry];
salt = [OFData dataWithBase64EncodedString: entry];
got |= GOT_SALT;
} else if ([comp hasPrefix: @"i="]) {
iterCount = [entry decimalValue];
@ -264,12 +266,11 @@ OF_ASSUME_NONNULL_END
@throw [OFInvalidServerReplyException exception];
// Add c=<base64(GS2Header+channelBindingData)>
tmpArray = [OFDataArray dataArray];
tmpArray = [OFMutableData data];
[tmpArray addItems: [_GS2Header UTF8String]
count: [_GS2Header UTF8StringLength]];
if (_plusAvailable && [_connection encrypted]) {
OFDataArray *channelBinding =
[((SSLSocket *)[_connection socket])
OFData *channelBinding = [((SSLSocket *)[_connection socket])
channelBindingDataWithType: @"tls-unique"];
[tmpArray addItems: [channelBinding items]
count: [channelBinding count]];
@ -291,10 +292,8 @@ OF_ASSUME_NONNULL_END
* IETF RFC 5802:
* SaltedPassword := Hi(Normalize(password), salt, i)
*/
tmpArray = [OFDataArray dataArray];
[tmpArray addItems: [_password UTF8String]
count: [_password UTF8StringLength]];
tmpArray = [OFMutableData dataWithItems: [_password UTF8String]
count: [_password UTF8StringLength]];
saltedPassword = [self XMPP_hiWithData: tmpArray
salt: salt
iterationCount: iterCount];
@ -318,11 +317,9 @@ OF_ASSUME_NONNULL_END
* IETF RFC 5802:
* ClientKey := HMAC(SaltedPassword, "Client Key")
*/
tmpArray = [OFDataArray dataArray];
[tmpArray addItems: "Client Key"
count: 10];
clientKey = [self XMPP_HMACWithKey: saltedPassword
data: tmpArray];
data: [OFData dataWithItems: @"Client key"
count: 10]];
/*
* IETF RFC 5802:
@ -330,9 +327,8 @@ OF_ASSUME_NONNULL_END
*/
[hash updateWithBuffer: (void *)clientKey
length: [_hashType digestSize]];
tmpArray = [OFDataArray dataArray];
[tmpArray addItems: [hash digest]
count: [_hashType digestSize]];
tmpArray = [OFMutableData dataWithItems: [hash digest]
count: [_hashType digestSize]];
/*
* IETF RFC 5802:
@ -345,9 +341,8 @@ OF_ASSUME_NONNULL_END
* IETF RFC 5802:
* ServerKey := HMAC(SaltedPassword, "Server Key")
*/
tmpArray = [OFDataArray dataArray];
[tmpArray addItems: "Server Key"
count: 10];
tmpArray = [OFMutableData dataWithItems: "Server Key"
count: 10];
serverKey = [self XMPP_HMACWithKey: saltedPassword
data: tmpArray];
@ -355,19 +350,20 @@ OF_ASSUME_NONNULL_END
* IETF RFC 5802:
* ServerSignature := HMAC(ServerKey, AuthMessage)
*/
tmpArray = [OFDataArray dataArray];
[tmpArray addItems: serverKey
count: [_hashType digestSize]];
_serverSignature = [[OFDataArray alloc] init];
[_serverSignature addItems: [self XMPP_HMACWithKey: tmpArray
data: authMessage]
count: [_hashType digestSize]];
tmpArray = [OFMutableData dataWithItems: serverKey
count: [_hashType digestSize]];
[_serverSignature release];
_serverSignature = [[OFMutableData alloc]
initWithItems: [self XMPP_HMACWithKey: tmpArray
data: authMessage]
count: [_hashType digestSize]];
/*
* IETF RFC 5802:
* ClientProof := ClientKey XOR ClientSignature
*/
tmpArray = [OFDataArray dataArray];
tmpArray = [OFMutableData data];
for (i = 0; i < [_hashType digestSize]; i++) {
uint8_t c = clientKey[i] ^ clientSignature[i];
[tmpArray addItem: &c];
@ -384,7 +380,7 @@ OF_ASSUME_NONNULL_END
return ret;
}
- (OFDataArray *)XMPP_parseServerFinalMessage: (OFDataArray *)data
- (OFData *)XMPP_parseServerFinalMessage: (OFData *)data
{
OFString *mess, *value;
@ -396,8 +392,7 @@ OF_ASSUME_NONNULL_END
return nil;
mess = [OFString stringWithUTF8String: [data items]
length: [data count] *
[data itemSize]];
length: [data count] * [data itemSize]];
value = [mess substringWithRange: of_range(2, [mess length] - 2)];
if ([mess hasPrefix: @"v="]) {
@ -435,11 +430,11 @@ OF_ASSUME_NONNULL_END
length: 64];
}
- (const uint8_t *)XMPP_HMACWithKey: (OFDataArray *)key
data: (OFDataArray *)data
- (const uint8_t *)XMPP_HMACWithKey: (OFData *)key
data: (OFData *)data
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFDataArray *k = [OFDataArray dataArray];
OFMutableData *k = [OFMutableData data];
size_t i, kSize, blockSize = [_hashType blockSize];
uint8_t *kI = NULL, *kO = NULL;
id <OFCryptoHash> hashI, hashO;
@ -490,16 +485,16 @@ OF_ASSUME_NONNULL_END
return [[hashO autorelease] digest];
}
- (OFDataArray *)XMPP_hiWithData: (OFDataArray *)str
salt: (OFDataArray *)salt
iterationCount: (intmax_t)i
- (OFData *)XMPP_hiWithData: (OFData *)str
salt: (OFData *)salt
iterationCount: (intmax_t)i
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
size_t digestSize = [_hashType digestSize];
uint8_t *result = NULL;
const uint8_t *u, *uOld;
intmax_t j, k;
OFDataArray *salty, *tmp, *ret;
OFMutableData *salty, *tmp, *ret;
result = [self allocMemoryWithSize: digestSize];
@ -517,7 +512,7 @@ OF_ASSUME_NONNULL_END
result[j] ^= uOld[j];
for (j = 0; j < i - 1; j++) {
tmp = [[OFDataArray alloc] init];
tmp = [[OFMutableData alloc] init];
[tmp addItems: uOld
count: digestSize];
@ -533,9 +528,8 @@ OF_ASSUME_NONNULL_END
uOld = u;
}
ret = [OFDataArray dataArray];
[ret addItems: result
count: digestSize];
ret = [OFMutableData dataWithItems: result
count: digestSize];
} @finally {
[self freeMemory: result];
}

3
src/XMPPStanza.m
View file

@ -111,7 +111,8 @@
ID: (OFString *)ID
{
self = [super initWithName: name
namespace: XMPP_NS_CLIENT];
namespace: XMPP_NS_CLIENT
stringValue: nil];
@try {
if (![name isEqual: @"iq"] && ![name isEqual: @"message"] &&