@@ -197,11 +197,11 @@
 }
 
 - (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data
 {
 	size_t i;
-	uint8_t *clientKey, *serverKey, *clientSignature;
+	const uint8_t *clientKey, *serverKey, *clientSignature;
 	intmax_t iterCount = 0;
 	id <OFHash> hash;
 	OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword;
 	OFString *tmpString, *sNonce = nil;
 	OFEnumerator *enumerator;
@@ -417,11 +417,11 @@
 	return [OFString stringWithCString: (char*)buf
 				  encoding: OF_STRING_ENCODING_ASCII
 				    length: 64];
 }
 
-- (uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
+- (const uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
 			data: (OFDataArray*)data
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFDataArray *k = [OFDataArray dataArray];
 	size_t i, kSize, blockSize = [_hashType blockSize];
@@ -478,11 +478,12 @@
 			   salt: (OFDataArray*)salt
 		 iterationCount: (intmax_t)i
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	size_t digestSize = [_hashType digestSize];
-	uint8_t *result = NULL, *u, *uOld;
+	uint8_t *result = NULL;
+	const uint8_t *u, *uOld;
 	intmax_t j, k;
 	OFDataArray *salty, *tmp, *ret;
 
 	result = [self allocMemoryWithSize: digestSize];