Index: src/Makefile ================================================================== --- src/Makefile +++ src/Makefile @@ -13,23 +13,29 @@ OFExceptions.m \ OFFile.m \ OFHash.m \ OFEnumerator.m \ OFList.m \ + OFMD5Hash.m \ OFMutableArray.m \ OFMutableDictionary.m \ OFMutableString.m \ OFNumber.m \ OFObject.m \ ${OFPLUGIN_M} \ OFSeekableStream.m \ + OFSHA1Hash.m \ OFSocket.m \ OFStream.m \ OFString.m \ + OFString+Hashing.m \ + OFString+URLEncoding.m \ + OFString+XMLEscaping.m \ + OFString+XMLUnescaping.m \ OFTCPSocket.m \ ${OFTHREAD_M} \ - OFURLEncoding.m \ + OFXMLAttribute.m \ OFXMLElement.m \ OFXMLParser.m \ unicode.m INCLUDES := ${SRCS:.m=.h} \ Index: src/OFHash.h ================================================================== --- src/OFHash.h +++ src/OFHash.h @@ -8,16 +8,10 @@ * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" -#import "OFString.h" - -#define OF_MD5_DIGEST_SIZE 16 -#define OF_SHA1_DIGEST_SIZE 20 - -extern int _OFHashing_reference; /** * \brief A base class for classes providing hash functions. */ @interface OFHash: OFObject @@ -47,54 +41,5 @@ /** * \return A boolean whether the hash has already been calculated */ - (BOOL)calculated; @end - -/** - * \brief A class which provides functions to create an MD5 hash. - */ -@interface OFMD5Hash: OFHash -{ - uint32_t buf[4]; - uint32_t bits[2]; - uint8_t in[64]; -} - -/** - * \return A new autoreleased MD5 Hash - */ -+ md5Hash; -@end - -/** - * \brief A class which provides functions to create an SHA1 hash. - */ -@interface OFSHA1Hash: OFHash -{ - uint32_t state[5]; - uint64_t count; - char buffer[64]; - uint8_t digest[OF_SHA1_DIGEST_SIZE]; -} - -/** - * \return A new autoreleased SHA1 Hash - */ -+ sha1Hash; -@end - -/** - * The OFString (OFHashing) category provides methods to calculate hashes for - * strings. - */ -@interface OFString (OFHashing) -/** - * \return The MD5 hash of the string as an autoreleased OFString - */ -- (OFString*)md5Hash; - -/** - * \return The SHA1 hash of the string as an autoreleased OFString - */ -- (OFString*)sha1Hash; -@end Index: src/OFHash.m ================================================================== --- src/OFHash.m +++ src/OFHash.m @@ -9,18 +9,12 @@ * the packaging of this file. */ #include "config.h" -#include - #import "OFHash.h" -#import "OFAutoreleasePool.h" #import "OFExceptions.h" -#import "macros.h" - -int _OFHashing_reference; @implementation OFHash - (void)updateWithBuffer: (const char*)buffer ofSize: (size_t)size { @@ -36,468 +30,6 @@ - (BOOL)calculated { return calculated; } -@end - -/* - * MD5 - */ - -/* The four MD5 core functions - F1 is optimized somewhat */ -#define F1(x, y, z) (z ^ (x & (y ^ z))) -#define F2(x, y, z) F1(z, x, y) -#define F3(x, y, z) (x ^ y ^ z) -#define F4(x, y, z) (y ^ (x | ~z)) - -/* This is the central step in the MD5 algorithm. */ -#define MD5STEP(f, w, x, y, z, data, s) \ - (w += f(x, y, z) + data, w = w << s | w >> (32 - s), w += x) - -static inline void -md5_transform(uint32_t buf[4], const uint32_t in[16]) -{ - register uint32_t a, b, c, d; - - a = buf[0]; - b = buf[1]; - c = buf[2]; - d = buf[3]; - - MD5STEP(F1, a, b, c, d, in[0] + 0xD76AA478, 7); - MD5STEP(F1, d, a, b, c, in[1] + 0xE8C7B756, 12); - MD5STEP(F1, c, d, a, b, in[2] + 0x242070DB, 17); - MD5STEP(F1, b, c, d, a, in[3] + 0xC1BDCEEE, 22); - MD5STEP(F1, a, b, c, d, in[4] + 0xF57C0FAF, 7); - MD5STEP(F1, d, a, b, c, in[5] + 0x4787C62A, 12); - MD5STEP(F1, c, d, a, b, in[6] + 0xA8304613, 17); - MD5STEP(F1, b, c, d, a, in[7] + 0xFD469501, 22); - MD5STEP(F1, a, b, c, d, in[8] + 0x698098D8, 7); - MD5STEP(F1, d, a, b, c, in[9] + 0x8B44F7AF, 12); - MD5STEP(F1, c, d, a, b, in[10] + 0xFFFF5BB1, 17); - MD5STEP(F1, b, c, d, a, in[11] + 0x895CD7Be, 22); - MD5STEP(F1, a, b, c, d, in[12] + 0x6B901122, 7); - MD5STEP(F1, d, a, b, c, in[13] + 0xFD987193, 12); - MD5STEP(F1, c, d, a, b, in[14] + 0xA679438e, 17); - MD5STEP(F1, b, c, d, a, in[15] + 0x49B40821, 22); - - MD5STEP(F2, a, b, c, d, in[1] + 0xF61E2562, 5); - MD5STEP(F2, d, a, b, c, in[6] + 0xC040B340, 9); - MD5STEP(F2, c, d, a, b, in[11] + 0x265E5A51, 14); - MD5STEP(F2, b, c, d, a, in[0] + 0xE9B6C7AA, 20); - MD5STEP(F2, a, b, c, d, in[5] + 0xD62F105D, 5); - MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); - MD5STEP(F2, c, d, a, b, in[15] + 0xD8A1E681, 14); - MD5STEP(F2, b, c, d, a, in[4] + 0xE7D3FBC8, 20); - MD5STEP(F2, a, b, c, d, in[9] + 0x21E1CDE6, 5); - MD5STEP(F2, d, a, b, c, in[14] + 0xC33707D6, 9); - MD5STEP(F2, c, d, a, b, in[3] + 0xF4D50D87, 14); - MD5STEP(F2, b, c, d, a, in[8] + 0x455A14ED, 20); - MD5STEP(F2, a, b, c, d, in[13] + 0xA9E3E905, 5); - MD5STEP(F2, d, a, b, c, in[2] + 0xFCEFA3F8, 9); - MD5STEP(F2, c, d, a, b, in[7] + 0x676F02D9, 14); - MD5STEP(F2, b, c, d, a, in[12] + 0x8D2A4C8a, 20); - - MD5STEP(F3, a, b, c, d, in[5] + 0xFFFA3942, 4); - MD5STEP(F3, d, a, b, c, in[8] + 0x8771F681, 11); - MD5STEP(F3, c, d, a, b, in[11] + 0x6D9D6122, 16); - MD5STEP(F3, b, c, d, a, in[14] + 0xFDE5380c, 23); - MD5STEP(F3, a, b, c, d, in[1] + 0xA4BEEA44, 4); - MD5STEP(F3, d, a, b, c, in[4] + 0x4BDECFA9, 11); - MD5STEP(F3, c, d, a, b, in[7] + 0xF6BB4B60, 16); - MD5STEP(F3, b, c, d, a, in[10] + 0xBEBFBC70, 23); - MD5STEP(F3, a, b, c, d, in[13] + 0x289B7EC6, 4); - MD5STEP(F3, d, a, b, c, in[0] + 0xEAA127FA, 11); - MD5STEP(F3, c, d, a, b, in[3] + 0xD4EF3085, 16); - MD5STEP(F3, b, c, d, a, in[6] + 0x04881D05, 23); - MD5STEP(F3, a, b, c, d, in[9] + 0xD9D4D039, 4); - MD5STEP(F3, d, a, b, c, in[12] + 0xE6DB99E5, 11); - MD5STEP(F3, c, d, a, b, in[15] + 0x1FA27CF8, 16); - MD5STEP(F3, b, c, d, a, in[2] + 0xC4AC5665, 23); - - MD5STEP(F4, a, b, c, d, in[0] + 0xF4292244, 6); - MD5STEP(F4, d, a, b, c, in[7] + 0x432AFF97, 10); - MD5STEP(F4, c, d, a, b, in[14] + 0xAB9423A7, 15); - MD5STEP(F4, b, c, d, a, in[5] + 0xFC93A039, 21); - MD5STEP(F4, a, b, c, d, in[12] + 0x655B59C3, 6); - MD5STEP(F4, d, a, b, c, in[3] + 0x8F0CCC92, 10); - MD5STEP(F4, c, d, a, b, in[10] + 0xFFEFF47d, 15); - MD5STEP(F4, b, c, d, a, in[1] + 0x85845DD1, 21); - MD5STEP(F4, a, b, c, d, in[8] + 0x6FA87E4F, 6); - MD5STEP(F4, d, a, b, c, in[15] + 0xFE2CE6E0, 10); - MD5STEP(F4, c, d, a, b, in[6] + 0xA3014314, 15); - MD5STEP(F4, b, c, d, a, in[13] + 0x4E0811A1, 21); - MD5STEP(F4, a, b, c, d, in[4] + 0xF7537E82, 6); - MD5STEP(F4, d, a, b, c, in[11] + 0xBD3AF235, 10); - MD5STEP(F4, c, d, a, b, in[2] + 0x2AD7D2BB, 15); - MD5STEP(F4, b, c, d, a, in[9] + 0xEB86D391, 21); - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; -} - -@implementation OFMD5Hash -+ md5Hash -{ - return [[[self alloc] init] autorelease]; -} - -- init -{ - self = [super init]; - - buf[0] = 0x67452301; - buf[1] = 0xEFCDAB89; - buf[2] = 0x98BADCFE; - buf[3] = 0x10325476; - - return self; -} - -- (void)updateWithBuffer: (const char*)buffer - ofSize: (size_t)size -{ - uint32_t t; - - if (size == 0) - return; - - if (calculated) - @throw [OFHashAlreadyCalculatedException newWithClass: isa]; - - /* Update bitcount */ - t = bits[0]; - if ((bits[0] = t + ((uint32_t)size << 3)) < t) - /* Carry from low to high */ - bits[1]++; - bits[1] += size >> 29; - - /* Bytes already in shsInfo->data */ - t = (t >> 3) & 0x3F; - - /* Handle any leading odd-sized chunks */ - if (t) { - uint8_t *p = in + t; - - t = 64 - t; - - if (size < t) { - memcpy(p, buffer, size); - return; - } - - memcpy(p, buffer, t); - OF_BSWAP32_V_IF_BE((uint32_t*)in, 16); - md5_transform(buf, (uint32_t*)in); - - buffer += t; - size -= t; - } - - /* Process data in 64-byte chunks */ - while (size >= 64) { - memcpy(in, buffer, 64); - OF_BSWAP32_V_IF_BE((uint32_t*)in, 16); - md5_transform(buf, (uint32_t*)in); - - buffer += 64; - size -= 64; - } - - /* Handle any remaining bytes of data. */ - memcpy(in, buffer, size); -} - -- (uint8_t*)digest -{ - uint8_t *p; - size_t count; - - if (calculated) - return (uint8_t*)buf; - - /* Compute number of bytes mod 64 */ - count = (bits[0] >> 3) & 0x3F; - - /* - * Set the first char of padding to 0x80. This is safe since there is - * always at least one byte free - */ - p = in + count; - *p++ = 0x80; - - /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; - - /* Pad out to 56 mod 64 */ - if (count < 8) { - /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); - OF_BSWAP32_V_IF_BE((uint32_t*)in, 16); - md5_transform(buf, (uint32_t*)in); - - /* Now fill the next block with 56 bytes */ - memset(in, 0, 56); - } else { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } - OF_BSWAP32_V_IF_BE((uint32_t*)in, 14); - - /* Append length in bits and transform */ - ((uint32_t*)in)[14] = bits[0]; - ((uint32_t*)in)[15] = bits[1]; - - md5_transform(buf, (uint32_t*)in); - OF_BSWAP32_V_IF_BE(buf, 4); - - calculated = YES; - - return (uint8_t*)buf; -} -@end - -#undef F1 -#undef F2 -#undef F3 -#undef F4 -#undef MD5STEP - -/* - * SHA1 - */ - -/* blk0() and blk() perform the initial expand. */ -#ifndef OF_BIG_ENDIAN -#define blk0(i) \ - (block->l[i] = (OF_ROL(block->l[i], 24) & 0xFF00FF00) | \ - (OF_ROL(block->l[i], 8) & 0x00FF00FF)) -#else -#define blk0(i) block->l[i] -#endif -#define blk(i) \ - (block->l[i & 15] = OF_ROL(block->l[(i + 13) & 15] ^ \ - block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ \ - block->l[i & 15], 1)) - -/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define R0(v, w, x, y, z, i) \ - z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + OF_ROL(v, 5); \ - w = OF_ROL(w, 30); -#define R1(v, w, x, y, z, i) \ - z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + OF_ROL(v, 5); \ - w = OF_ROL(w, 30); -#define R2(v, w, x, y, z, i) \ - z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + OF_ROL(v, 5); \ - w = OF_ROL(w, 30); -#define R3(v, w, x, y, z, i) \ - z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + OF_ROL(v, 5); \ - w = OF_ROL(w, 30); -#define R4(v, w, x, y, z, i) \ - z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + OF_ROL(v, 5); \ - w = OF_ROL(w, 30); - -/// \cond internal -typedef union { - char c[64]; - uint32_t l[16]; -} sha1_c64l16_t; -/// \endcond - -static inline void -sha1_transform(uint32_t state[5], const char buffer[64]) -{ - uint32_t a, b, c, d, e; - char workspace[64]; - sha1_c64l16_t *block; - - block = (sha1_c64l16_t*)workspace; - memcpy(block, buffer, 64); - - /* Copy state[] to working vars */ - a = state[0]; - b = state[1]; - c = state[2]; - d = state[3]; - e = state[4]; - - /* 4 rounds of 20 operations each. Loop unrolled. */ - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); - - /* Add the working vars back into state[] */ - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; -} - -static inline void -sha1_update(uint32_t *state, uint64_t *count, char *buffer, - const char *buf, size_t size) -{ - size_t i, j; - - j = (size_t)((*count >> 3) & 63); - *count += (size << 3); - - if ((j + size) > 63) { - memcpy(&buffer[j], buf, (i = 64 - j)); - - sha1_transform(state, buffer); - - for (; i + 63 < size; i += 64) - sha1_transform(state, &buf[i]); - - j = 0; - } else - i = 0; - - memcpy(&buffer[j], &buf[i], size - i); -} - -@implementation OFSHA1Hash -+ sha1Hash -{ - return [[[self alloc] init] autorelease]; -} - -- init -{ - self = [super init]; - - state[0] = 0x67452301; - state[1] = 0xEFCDAB89; - state[2] = 0x98BADCFE; - state[3] = 0x10325476; - state[4] = 0xC3D2E1F0; - - return self; -} - -- (void)updateWithBuffer: (const char*)buf - ofSize: (size_t)size -{ - if (size == 0) - return; - - if (calculated) - @throw [OFHashAlreadyCalculatedException newWithClass: isa]; - - sha1_update(state, &count, buffer, buf, size); -} - -- (uint8_t*)digest -{ - size_t i; - char finalcount[8]; - - if (calculated) - return digest; - - for (i = 0; i < 8; i++) - /* Endian independent */ - finalcount[i] = (char)((count >> ((7 - (i & 7)) * 8)) & 255); - sha1_update(state, &count, buffer, "\200", 1); - - while ((count & 504) != 448) - sha1_update(state, &count, buffer, "\0", 1); - /* Should cause a sha1_transform() */ - sha1_update(state, &count, buffer, finalcount, 8); - - for (i = 0; i < OF_SHA1_DIGEST_SIZE; i++) - digest[i] = (char)((state[i >> 2] >> - ((3 - (i & 3)) * 8)) & 255); - - calculated = YES; - - return digest; -} -@end - -#undef blk0 -#undef blk -#undef R0 -#undef R1 -#undef R2 -#undef R3 -#undef R4 - -@implementation OFString (OFHashing) -- (OFString*)md5Hash -{ - OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; - OFMD5Hash *hash = [OFMD5Hash md5Hash]; - uint8_t *digest; - char ret_c[32]; - size_t i; - - [hash updateWithBuffer: string - ofSize: length]; - digest = [hash digest]; - - for (i = 0; i < 16; i++) { - uint8_t high, low; - - high = digest[i] >> 4; - low = digest[i] & 0x0F; - - ret_c[i * 2] = (high > 9 ? high - 10 + 'a' : high + '0'); - ret_c[i * 2 + 1] = (low > 9 ? low - 10 + 'a' : low + '0'); - } - - [pool release]; - - return [OFString stringWithCString: ret_c - length: 32]; -} - -- (OFString*)sha1Hash -{ - OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; - OFMD5Hash *hash = [OFSHA1Hash sha1Hash]; - uint8_t *digest; - char ret_c[40]; - size_t i; - - [hash updateWithBuffer: string - ofSize: length]; - digest = [hash digest]; - - for (i = 0; i < 20; i++) { - uint8_t high, low; - - high = digest[i] >> 4; - low = digest[i] & 0x0F; - - ret_c[i * 2] = (high > 9 ? high - 10 + 'a' : high + '0'); - ret_c[i * 2 + 1] = (low > 9 ? low - 10 + 'a' : low + '0'); - } - - [pool release]; - - return [OFString stringWithCString: ret_c - length: 40]; -} @end ADDED src/OFMD5Hash.h Index: src/OFMD5Hash.h ================================================================== --- src/OFMD5Hash.h +++ src/OFMD5Hash.h @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#import "OFHash.h" + +#define OF_MD5_DIGEST_SIZE 16 + +/** + * \brief A class which provides functions to create an MD5 hash. + */ +@interface OFMD5Hash: OFHash +{ + uint32_t buf[4]; + uint32_t bits[2]; + uint8_t in[64]; +} + +/** + * \return A new autoreleased MD5 Hash + */ ++ md5Hash; +@end ADDED src/OFMD5Hash.m Index: src/OFMD5Hash.m ================================================================== --- src/OFMD5Hash.m +++ src/OFMD5Hash.m @@ -0,0 +1,233 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include + +#import "OFMD5Hash.h" +#import "OFExceptions.h" +#import "macros.h" + +/* The four MD5 core functions - F1 is optimized somewhat */ +#define F1(x, y, z) (z ^ (x & (y ^ z))) +#define F2(x, y, z) F1(z, x, y) +#define F3(x, y, z) (x ^ y ^ z) +#define F4(x, y, z) (y ^ (x | ~z)) + +/* This is the central step in the MD5 algorithm. */ +#define MD5STEP(f, w, x, y, z, data, s) \ + (w += f(x, y, z) + data, w = w << s | w >> (32 - s), w += x) + +static void +md5_transform(uint32_t buf[4], const uint32_t in[16]) +{ + register uint32_t a, b, c, d; + + a = buf[0]; + b = buf[1]; + c = buf[2]; + d = buf[3]; + + MD5STEP(F1, a, b, c, d, in[0] + 0xD76AA478, 7); + MD5STEP(F1, d, a, b, c, in[1] + 0xE8C7B756, 12); + MD5STEP(F1, c, d, a, b, in[2] + 0x242070DB, 17); + MD5STEP(F1, b, c, d, a, in[3] + 0xC1BDCEEE, 22); + MD5STEP(F1, a, b, c, d, in[4] + 0xF57C0FAF, 7); + MD5STEP(F1, d, a, b, c, in[5] + 0x4787C62A, 12); + MD5STEP(F1, c, d, a, b, in[6] + 0xA8304613, 17); + MD5STEP(F1, b, c, d, a, in[7] + 0xFD469501, 22); + MD5STEP(F1, a, b, c, d, in[8] + 0x698098D8, 7); + MD5STEP(F1, d, a, b, c, in[9] + 0x8B44F7AF, 12); + MD5STEP(F1, c, d, a, b, in[10] + 0xFFFF5BB1, 17); + MD5STEP(F1, b, c, d, a, in[11] + 0x895CD7Be, 22); + MD5STEP(F1, a, b, c, d, in[12] + 0x6B901122, 7); + MD5STEP(F1, d, a, b, c, in[13] + 0xFD987193, 12); + MD5STEP(F1, c, d, a, b, in[14] + 0xA679438e, 17); + MD5STEP(F1, b, c, d, a, in[15] + 0x49B40821, 22); + + MD5STEP(F2, a, b, c, d, in[1] + 0xF61E2562, 5); + MD5STEP(F2, d, a, b, c, in[6] + 0xC040B340, 9); + MD5STEP(F2, c, d, a, b, in[11] + 0x265E5A51, 14); + MD5STEP(F2, b, c, d, a, in[0] + 0xE9B6C7AA, 20); + MD5STEP(F2, a, b, c, d, in[5] + 0xD62F105D, 5); + MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); + MD5STEP(F2, c, d, a, b, in[15] + 0xD8A1E681, 14); + MD5STEP(F2, b, c, d, a, in[4] + 0xE7D3FBC8, 20); + MD5STEP(F2, a, b, c, d, in[9] + 0x21E1CDE6, 5); + MD5STEP(F2, d, a, b, c, in[14] + 0xC33707D6, 9); + MD5STEP(F2, c, d, a, b, in[3] + 0xF4D50D87, 14); + MD5STEP(F2, b, c, d, a, in[8] + 0x455A14ED, 20); + MD5STEP(F2, a, b, c, d, in[13] + 0xA9E3E905, 5); + MD5STEP(F2, d, a, b, c, in[2] + 0xFCEFA3F8, 9); + MD5STEP(F2, c, d, a, b, in[7] + 0x676F02D9, 14); + MD5STEP(F2, b, c, d, a, in[12] + 0x8D2A4C8a, 20); + + MD5STEP(F3, a, b, c, d, in[5] + 0xFFFA3942, 4); + MD5STEP(F3, d, a, b, c, in[8] + 0x8771F681, 11); + MD5STEP(F3, c, d, a, b, in[11] + 0x6D9D6122, 16); + MD5STEP(F3, b, c, d, a, in[14] + 0xFDE5380c, 23); + MD5STEP(F3, a, b, c, d, in[1] + 0xA4BEEA44, 4); + MD5STEP(F3, d, a, b, c, in[4] + 0x4BDECFA9, 11); + MD5STEP(F3, c, d, a, b, in[7] + 0xF6BB4B60, 16); + MD5STEP(F3, b, c, d, a, in[10] + 0xBEBFBC70, 23); + MD5STEP(F3, a, b, c, d, in[13] + 0x289B7EC6, 4); + MD5STEP(F3, d, a, b, c, in[0] + 0xEAA127FA, 11); + MD5STEP(F3, c, d, a, b, in[3] + 0xD4EF3085, 16); + MD5STEP(F3, b, c, d, a, in[6] + 0x04881D05, 23); + MD5STEP(F3, a, b, c, d, in[9] + 0xD9D4D039, 4); + MD5STEP(F3, d, a, b, c, in[12] + 0xE6DB99E5, 11); + MD5STEP(F3, c, d, a, b, in[15] + 0x1FA27CF8, 16); + MD5STEP(F3, b, c, d, a, in[2] + 0xC4AC5665, 23); + + MD5STEP(F4, a, b, c, d, in[0] + 0xF4292244, 6); + MD5STEP(F4, d, a, b, c, in[7] + 0x432AFF97, 10); + MD5STEP(F4, c, d, a, b, in[14] + 0xAB9423A7, 15); + MD5STEP(F4, b, c, d, a, in[5] + 0xFC93A039, 21); + MD5STEP(F4, a, b, c, d, in[12] + 0x655B59C3, 6); + MD5STEP(F4, d, a, b, c, in[3] + 0x8F0CCC92, 10); + MD5STEP(F4, c, d, a, b, in[10] + 0xFFEFF47d, 15); + MD5STEP(F4, b, c, d, a, in[1] + 0x85845DD1, 21); + MD5STEP(F4, a, b, c, d, in[8] + 0x6FA87E4F, 6); + MD5STEP(F4, d, a, b, c, in[15] + 0xFE2CE6E0, 10); + MD5STEP(F4, c, d, a, b, in[6] + 0xA3014314, 15); + MD5STEP(F4, b, c, d, a, in[13] + 0x4E0811A1, 21); + MD5STEP(F4, a, b, c, d, in[4] + 0xF7537E82, 6); + MD5STEP(F4, d, a, b, c, in[11] + 0xBD3AF235, 10); + MD5STEP(F4, c, d, a, b, in[2] + 0x2AD7D2BB, 15); + MD5STEP(F4, b, c, d, a, in[9] + 0xEB86D391, 21); + + buf[0] += a; + buf[1] += b; + buf[2] += c; + buf[3] += d; +} + +@implementation OFMD5Hash ++ md5Hash +{ + return [[[self alloc] init] autorelease]; +} + +- init +{ + self = [super init]; + + buf[0] = 0x67452301; + buf[1] = 0xEFCDAB89; + buf[2] = 0x98BADCFE; + buf[3] = 0x10325476; + + return self; +} + +- (void)updateWithBuffer: (const char*)buffer + ofSize: (size_t)size +{ + uint32_t t; + + if (size == 0) + return; + + if (calculated) + @throw [OFHashAlreadyCalculatedException newWithClass: isa]; + + /* Update bitcount */ + t = bits[0]; + if ((bits[0] = t + ((uint32_t)size << 3)) < t) + /* Carry from low to high */ + bits[1]++; + bits[1] += size >> 29; + + /* Bytes already in shsInfo->data */ + t = (t >> 3) & 0x3F; + + /* Handle any leading odd-sized chunks */ + if (t) { + uint8_t *p = in + t; + + t = 64 - t; + + if (size < t) { + memcpy(p, buffer, size); + return; + } + + memcpy(p, buffer, t); + OF_BSWAP32_V_IF_BE((uint32_t*)in, 16); + md5_transform(buf, (uint32_t*)in); + + buffer += t; + size -= t; + } + + /* Process data in 64-byte chunks */ + while (size >= 64) { + memcpy(in, buffer, 64); + OF_BSWAP32_V_IF_BE((uint32_t*)in, 16); + md5_transform(buf, (uint32_t*)in); + + buffer += 64; + size -= 64; + } + + /* Handle any remaining bytes of data. */ + memcpy(in, buffer, size); +} + +- (uint8_t*)digest +{ + uint8_t *p; + size_t count; + + if (calculated) + return (uint8_t*)buf; + + /* Compute number of bytes mod 64 */ + count = (bits[0] >> 3) & 0x3F; + + /* + * Set the first char of padding to 0x80. This is safe since there is + * always at least one byte free + */ + p = in + count; + *p++ = 0x80; + + /* Bytes of padding needed to make 64 bytes */ + count = 64 - 1 - count; + + /* Pad out to 56 mod 64 */ + if (count < 8) { + /* Two lots of padding: Pad the first block to 64 bytes */ + memset(p, 0, count); + OF_BSWAP32_V_IF_BE((uint32_t*)in, 16); + md5_transform(buf, (uint32_t*)in); + + /* Now fill the next block with 56 bytes */ + memset(in, 0, 56); + } else { + /* Pad block to 56 bytes */ + memset(p, 0, count - 8); + } + OF_BSWAP32_V_IF_BE((uint32_t*)in, 14); + + /* Append length in bits and transform */ + ((uint32_t*)in)[14] = bits[0]; + ((uint32_t*)in)[15] = bits[1]; + + md5_transform(buf, (uint32_t*)in); + OF_BSWAP32_V_IF_BE(buf, 4); + + calculated = YES; + + return (uint8_t*)buf; +} +@end ADDED src/OFSHA1Hash.h Index: src/OFSHA1Hash.h ================================================================== --- src/OFSHA1Hash.h +++ src/OFSHA1Hash.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#import "OFHash.h" + +#define OF_SHA1_DIGEST_SIZE 20 + +/** + * \brief A class which provides functions to create an SHA1 hash. + */ +@interface OFSHA1Hash: OFHash +{ + uint32_t state[5]; + uint64_t count; + char buffer[64]; + uint8_t digest[OF_SHA1_DIGEST_SIZE]; +} + +/** + * \return A new autoreleased SHA1 Hash + */ ++ sha1Hash; +@end ADDED src/OFSHA1Hash.m Index: src/OFSHA1Hash.m ================================================================== --- src/OFSHA1Hash.m +++ src/OFSHA1Hash.m @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include + +#import "OFSHA1Hash.h" +#import "OFExceptions.h" +#import "macros.h" + +/* blk0() and blk() perform the initial expand. */ +#ifndef OF_BIG_ENDIAN +#define blk0(i) \ + (block->l[i] = (OF_ROL(block->l[i], 24) & 0xFF00FF00) | \ + (OF_ROL(block->l[i], 8) & 0x00FF00FF)) +#else +#define blk0(i) block->l[i] +#endif +#define blk(i) \ + (block->l[i & 15] = OF_ROL(block->l[(i + 13) & 15] ^ \ + block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ \ + block->l[i & 15], 1)) + +/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ +#define R0(v, w, x, y, z, i) \ + z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + OF_ROL(v, 5); \ + w = OF_ROL(w, 30); +#define R1(v, w, x, y, z, i) \ + z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + OF_ROL(v, 5); \ + w = OF_ROL(w, 30); +#define R2(v, w, x, y, z, i) \ + z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + OF_ROL(v, 5); \ + w = OF_ROL(w, 30); +#define R3(v, w, x, y, z, i) \ + z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + OF_ROL(v, 5); \ + w = OF_ROL(w, 30); +#define R4(v, w, x, y, z, i) \ + z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + OF_ROL(v, 5); \ + w = OF_ROL(w, 30); + +/// \cond internal +typedef union { + char c[64]; + uint32_t l[16]; +} sha1_c64l16_t; +/// \endcond + +static inline void +sha1_transform(uint32_t state[5], const char buffer[64]) +{ + uint32_t a, b, c, d, e; + char workspace[64]; + sha1_c64l16_t *block; + + block = (sha1_c64l16_t*)workspace; + memcpy(block, buffer, 64); + + /* Copy state[] to working vars */ + a = state[0]; + b = state[1]; + c = state[2]; + d = state[3]; + e = state[4]; + + /* 4 rounds of 20 operations each. Loop unrolled. */ + R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); + R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); + R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); + R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); + R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); + R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); + R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); + R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); + R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); + R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); + R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); + R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); + R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); + R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); + R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); + R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); + R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); + R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); + R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); + R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); + + /* Add the working vars back into state[] */ + state[0] += a; + state[1] += b; + state[2] += c; + state[3] += d; + state[4] += e; +} + +static inline void +sha1_update(uint32_t *state, uint64_t *count, char *buffer, + const char *buf, size_t size) +{ + size_t i, j; + + j = (size_t)((*count >> 3) & 63); + *count += (size << 3); + + if ((j + size) > 63) { + memcpy(&buffer[j], buf, (i = 64 - j)); + + sha1_transform(state, buffer); + + for (; i + 63 < size; i += 64) + sha1_transform(state, &buf[i]); + + j = 0; + } else + i = 0; + + memcpy(&buffer[j], &buf[i], size - i); +} + +@implementation OFSHA1Hash ++ sha1Hash +{ + return [[[self alloc] init] autorelease]; +} + +- init +{ + self = [super init]; + + state[0] = 0x67452301; + state[1] = 0xEFCDAB89; + state[2] = 0x98BADCFE; + state[3] = 0x10325476; + state[4] = 0xC3D2E1F0; + + return self; +} + +- (void)updateWithBuffer: (const char*)buf + ofSize: (size_t)size +{ + if (size == 0) + return; + + if (calculated) + @throw [OFHashAlreadyCalculatedException newWithClass: isa]; + + sha1_update(state, &count, buffer, buf, size); +} + +- (uint8_t*)digest +{ + size_t i; + char finalcount[8]; + + if (calculated) + return digest; + + for (i = 0; i < 8; i++) + /* Endian independent */ + finalcount[i] = (char)((count >> ((7 - (i & 7)) * 8)) & 255); + sha1_update(state, &count, buffer, "\200", 1); + + while ((count & 504) != 448) + sha1_update(state, &count, buffer, "\0", 1); + /* Should cause a sha1_transform() */ + sha1_update(state, &count, buffer, finalcount, 8); + + for (i = 0; i < OF_SHA1_DIGEST_SIZE; i++) + digest[i] = (char)((state[i >> 2] >> + ((3 - (i & 3)) * 8)) & 255); + + calculated = YES; + + return digest; +} +@end ADDED src/OFString+Hashing.h Index: src/OFString+Hashing.h ================================================================== --- src/OFString+Hashing.h +++ src/OFString+Hashing.h @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#import "OFString.h" + +extern int _OFString_Hashing_reference; + +/** + * The OFString (OFHashing) category provides methods to calculate hashes for + * strings. + */ +@interface OFString (Hashing) +/** + * \return The MD5 hash of the string as an autoreleased OFString + */ +- (OFString*)md5Hash; + +/** + * \return The SHA1 hash of the string as an autoreleased OFString + */ +- (OFString*)sha1Hash; +@end ADDED src/OFString+Hashing.m Index: src/OFString+Hashing.m ================================================================== --- src/OFString+Hashing.m +++ src/OFString+Hashing.m @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include + +#import "OFString.h" +#import "OFMD5Hash.h" +#import "OFSHA1Hash.h" +#import "OFAutoreleasePool.h" + +int _OFString_Hashing_reference; + +@implementation OFString (Hashing) +- (OFString*)md5Hash +{ + OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; + OFMD5Hash *hash = [OFMD5Hash md5Hash]; + uint8_t *digest; + char ret_c[32]; + size_t i; + + [hash updateWithBuffer: string + ofSize: length]; + digest = [hash digest]; + + for (i = 0; i < 16; i++) { + uint8_t high, low; + + high = digest[i] >> 4; + low = digest[i] & 0x0F; + + ret_c[i * 2] = (high > 9 ? high - 10 + 'a' : high + '0'); + ret_c[i * 2 + 1] = (low > 9 ? low - 10 + 'a' : low + '0'); + } + + [pool release]; + + return [OFString stringWithCString: ret_c + length: 32]; +} + +- (OFString*)sha1Hash +{ + OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; + OFMD5Hash *hash = [OFSHA1Hash sha1Hash]; + uint8_t *digest; + char ret_c[40]; + size_t i; + + [hash updateWithBuffer: string + ofSize: length]; + digest = [hash digest]; + + for (i = 0; i < 20; i++) { + uint8_t high, low; + + high = digest[i] >> 4; + low = digest[i] & 0x0F; + + ret_c[i * 2] = (high > 9 ? high - 10 + 'a' : high + '0'); + ret_c[i * 2 + 1] = (low > 9 ? low - 10 + 'a' : low + '0'); + } + + [pool release]; + + return [OFString stringWithCString: ret_c + length: 40]; +} +@end ADDED src/OFString+URLEncoding.h Index: src/OFString+URLEncoding.h ================================================================== --- src/OFString+URLEncoding.h +++ src/OFString+URLEncoding.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#import "OFString.h" + +extern int _OFString_URLEncoding_reference; + +/** + * \brief A category which provides URL encoding and decoding. + */ +@interface OFString (URLEncoding) +/** + * Encodes a string for use in a URL. + * + * \return A new autoreleased string + */ +- (OFString*)stringByURLEncoding; + +/** + * Decodes a string used in a URL. + * + * \return A new autoreleased string + */ +- (OFString*)stringByURLDecoding; +@end ADDED src/OFString+URLEncoding.m Index: src/OFString+URLEncoding.m ================================================================== --- src/OFString+URLEncoding.m +++ src/OFString+URLEncoding.m @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include +#include +#include + +#import "OFString+URLEncoding.h" +#import "OFExceptions.h" + +/* Reference for static linking */ +int _OFString_URLEncoding_reference; + +@implementation OFString (URLEncoding) +- (OFString*)stringByURLEncoding +{ + const char *s; + char *ret_c; + size_t i; + OFString *ret; + + s = string; + + /* + * Worst case: 3 times longer than before. + * Oh, and we can't use [self allocWithSize:] here as self might be a + * @"" literal. + */ + if ((ret_c = malloc((length * 3) + 1)) == NULL) + @throw [OFOutOfMemoryException newWithClass: isa + size: (length * 3) + 1]; + + for (i = 0; *s != '\0'; s++) { + if (isalnum((int)*s) || *s == '-' || *s == '_' || *s == '.' || + *s == '~') + ret_c[i++] = *s; + else { + uint8_t high, low; + + high = *s >> 4; + low = *s & 0x0F; + + ret_c[i++] = '%'; + ret_c[i++] = (high > 9 ? high - 10 + 'A' : high + '0'); + ret_c[i++] = (low > 9 ? low - 10 + 'A' : low + '0'); + } + } + + @try { + ret = [OFString stringWithCString: ret_c + length: i]; + } @finally { + free(ret_c); + } + + return ret; +} + +- (OFString*)stringByURLDecoding +{ + const char *s; + char *ret_c, c; + size_t i; + int st; + OFString *ret; + + s = string; + + if ((ret_c = malloc(length + 1)) == NULL) + @throw [OFOutOfMemoryException newWithClass: isa + size: length + 1]; + + for (st = 0, i = 0, c = 0; *s; s++) { + switch (st) { + case 0: + if (*s == '%') + st = 1; + else if (*s == '+') + ret_c[i++] = ' '; + else + ret_c[i++] = *s; + break; + case 1: + case 2: + if (*s >= '0' && *s <= '9') + c += (*s - '0') << (st == 1 ? 4 : 0); + else if (*s >= 'A' && *s <= 'F') + c += (*s - 'A' + 10) << (st == 1 ? 4 : 0); + else if (*s >= 'a' && *s <= 'f') + c += (*s - 'a' + 10) << (st == 1 ? 4 : 0); + else { + free(ret_c); + @throw [OFInvalidEncodingException + newWithClass: isa]; + } + + if (++st == 3) { + ret_c[i++] = c; + st = 0; + c = 0; + } + + break; + } + } + ret_c[i] = '\0'; + + if (st) { + free(ret_c); + @throw [OFInvalidEncodingException newWithClass: isa]; + } + + @try { + ret = [OFString stringWithCString: ret_c]; + } @finally { + free(ret_c); + } + return ret; +} +@end ADDED src/OFString+XMLEscaping.h Index: src/OFString+XMLEscaping.h ================================================================== --- src/OFString+XMLEscaping.h +++ src/OFString+XMLEscaping.h @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#import "OFString.h" + +extern int _OFString_XMLEscaping_reference; + +/** + * \brief A category to escape strings for use in an XML document. + */ +@interface OFString (XMLEscaping) +/** + * Escapes a string for use in an XML document. + * + * \return A new autoreleased string + */ +- (OFString*)stringByXMLEscaping; +@end ADDED src/OFString+XMLEscaping.m Index: src/OFString+XMLEscaping.m ================================================================== --- src/OFString+XMLEscaping.m +++ src/OFString+XMLEscaping.m @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include +#include +#include + +#import "OFString.h" +#import "OFExceptions.h" + +int _OFString_XMLEscaping_reference; + +@implementation OFString (XMLEscaping) +- (OFString*)stringByXMLEscaping +{ + char *str_c, *append, *tmp; + size_t len, append_len; + size_t i, j; + OFString *ret; + + j = 0; + len = length; + + /* + * We can't use allocMemoryWithSize: here as it might be a @"" literal + */ + if ((str_c = malloc(len)) == NULL) + @throw [OFOutOfMemoryException newWithClass: isa + size: len]; + + for (i = 0; i < length; i++) { + switch (string[i]) { + case '<': + append = "<"; + append_len = 4; + break; + case '>': + append = ">"; + append_len = 4; + break; + case '"': + append = """; + append_len = 6; + break; + case '\'': + append = "'"; + append_len = 6; + break; + case '&': + append = "&"; + append_len = 5; + break; + default: + append = NULL; + append_len = 0; + } + + if (append != NULL) { + if ((tmp = realloc(str_c, len + append_len)) == NULL) { + free(str_c); + @throw [OFOutOfMemoryException + newWithClass: isa + size: len + append_len]; + } + str_c = tmp; + len += append_len - 1; + + memcpy(str_c + j, append, append_len); + j += append_len; + } else + str_c[j++] = string[i]; + } + + assert(j == len); + + @try { + ret = [OFString stringWithCString: str_c + length: len]; + } @finally { + free(str_c); + } + return ret; +} +@end ADDED src/OFString+XMLUnescaping.h Index: src/OFString+XMLUnescaping.h ================================================================== --- src/OFString+XMLUnescaping.h +++ src/OFString+XMLUnescaping.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#import "OFString.h" + +extern int _OFString_XMLUnescaping_reference; + +/** + * \brief A protocol that needs to be implemented by delegates for + * -[stringByXMLUnescapingWithHandler:]. + */ +@protocol OFStringXMLUnescapingDelegate +/** + * This callback is called when an unknown entity was found while trying to + * unescape XML. The callback is supposed to return a substitution for the + * entity or nil if it is unknown to the callback as well, in which case an + * exception will be thrown. + * + * \param entity The name of the entity that is unknown + * \return A substitution for the entity or nil + */ +- (OFString*)didFindUnknownEntityNamed: (OFString*)entity; +@end + +/** + * \brief A category for unescaping XML in strings. + */ +@interface OFString (XMLUnescaping) +/** + * Unescapes XML in the string. + */ +- (OFString*)stringByXMLUnescaping; + +/** + * Unescapes XML in the string and uses the specified handler for unknown + * entities. + * + * \param h An OFXMLUnescapingDelegate as a handler for unknown entities + */ +- (OFString*)stringByXMLUnescapingWithHandler: + (OFObject *)h; +@end ADDED src/OFString+XMLUnescaping.m Index: src/OFString+XMLUnescaping.m ================================================================== --- src/OFString+XMLUnescaping.m +++ src/OFString+XMLUnescaping.m @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include + +#import "OFString.h" +#import "OFAutoreleasePool.h" +#import "OFExceptions.h" +#import "macros.h" + +int _OFString_XMLUnescaping_reference; + +static OF_INLINE OFString* +parse_numeric_entity(const char *entity, size_t length) +{ + of_unichar_t c; + size_t i; + char buf[5]; + + if (length == 1 || *entity != '#') + return nil; + + c = 0; + entity++; + length--; + + if (entity[0] == 'x') { + if (length == 1) + return nil; + + entity++; + length--; + + for (i = 0; i < length; i++) { + if (entity[i] >= '0' && entity[i] <= '9') + c = (c << 4) + (entity[i] - '0'); + else if (entity[i] >= 'A' && entity[i] <= 'F') + c = (c << 4) + (entity[i] - 'A' + 10); + else if (entity[i] >= 'a' && entity[i] <= 'f') + c = (c << 4) + (entity[i] - 'a' + 10); + else + return nil; + } + } else { + for (i = 0; i < length; i++) { + if (entity[i] >= '0' && entity[i] <= '9') + c = (c * 10) + (entity[i] - '0'); + else + return nil; + } + } + + if ((i = of_string_unicode_to_utf8(c, buf)) == 0) + return nil; + buf[i] = 0; + + return [OFString stringWithCString: buf + length: i]; +} + +@implementation OFString (XMLUnescaping) +- (OFString*)stringByXMLUnescaping +{ + return [self stringByXMLUnescapingWithHandler: nil]; +} + +- (OFString*)stringByXMLUnescapingWithHandler: + (OFObject *)h +{ + size_t i, last; + BOOL in_entity; + OFMutableString *ret; + + last = 0; + in_entity = NO; + ret = [OFMutableString string]; + + switch (of_string_check_utf8(string, length)) { + case 1: + ((OFString*)ret)->isUTF8 = YES; + break; + case -1: + @throw [OFInvalidEncodingException newWithClass: isa]; + } + + for (i = 0; i < length; i++) { + if (!in_entity && string[i] == '&') { + [ret appendCStringWithoutUTF8Checking: string + last + length: i - last]; + + last = i + 1; + in_entity = YES; + } else if (in_entity && string[i] == ';') { + char *entity = string + last; + size_t len = i - last; + + if (len == 2 && !memcmp(entity, "lt", 2)) + [ret appendCStringWithoutUTF8Checking: "<" + length: 1]; + else if (len == 2 && !memcmp(entity, "gt", 2)) + [ret appendCStringWithoutUTF8Checking: ">" + length: 1]; + else if (len == 4 && !memcmp(entity, "quot", 4)) + [ret appendCStringWithoutUTF8Checking: "\"" + length: 1]; + else if (len == 4 && !memcmp(entity, "apos", 4)) + [ret appendCStringWithoutUTF8Checking: "'" + length: 1]; + else if (len == 3 && !memcmp(entity, "amp", 3)) + [ret appendCStringWithoutUTF8Checking: "&" + length: 1]; + else if (entity[0] == '#') { + OFAutoreleasePool *pool; + OFString *tmp; + + pool = [[OFAutoreleasePool alloc] init]; + tmp = parse_numeric_entity(entity, len); + + if (tmp == nil) + @throw [OFInvalidEncodingException + newWithClass: isa]; + + [ret appendString: tmp]; + [pool release]; + } else if (h != nil) { + OFAutoreleasePool *pool; + OFString *n, *tmp; + + pool = [[OFAutoreleasePool alloc] init]; + + n = [OFString stringWithCString: entity + length: len]; + tmp = [h didFindUnknownEntityNamed: n]; + + if (tmp == nil) + @throw [OFInvalidEncodingException + newWithClass: isa]; + + [ret appendString: tmp]; + [pool release]; + } else + @throw [OFInvalidEncodingException + newWithClass: isa]; + + last = i + 1; + in_entity = NO; + } + } + + if (in_entity) + @throw [OFInvalidEncodingException newWithClass: isa]; + + [ret appendCStringWithoutUTF8Checking: string + last + length: i - last]; + + return ret; +} +@end Index: src/OFString.h ================================================================== --- src/OFString.h +++ src/OFString.h @@ -368,9 +368,9 @@ - (uintmax_t)hexadecimalValueAsInteger; @end #import "OFConstString.h" #import "OFMutableString.h" -#import "OFHash.h" -#import "OFURLEncoding.h" -#import "OFXMLElement.h" -#import "OFXMLParser.h" +#import "OFString+Hashing.h" +#import "OFString+URLEncoding.h" +#import "OFString+XMLEscaping.h" +#import "OFString+XMLUnescaping.h" Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -38,14 +38,14 @@ extern const uint16_t of_windows_1252[256]; /* References for static linking */ void _references_to_categories_of_OFString() { - _OFHashing_reference = 1; - _OFURLEncoding_reference = 1; - _OFXMLElement_reference = 1; - _OFXMLParser_reference = 1; + _OFString_Hashing_reference = 1; + _OFString_URLEncoding_reference = 1; + _OFString_XMLEscaping_reference = 1; + _OFString_XMLUnescaping_reference = 1; }; int of_string_check_utf8(const char *str, size_t len) { DELETED src/OFURLEncoding.h Index: src/OFURLEncoding.h ================================================================== --- src/OFURLEncoding.h +++ src/OFURLEncoding.h @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2008 - 2010 - * Jonathan Schleifer - * - * All rights reserved. - * - * This file is part of ObjFW. It may be distributed under the terms of the - * Q Public License 1.0, which can be found in the file LICENSE included in - * the packaging of this file. - */ - -#import "OFString.h" - -extern int _OFURLEncoding_reference; - -/** - * \brief A category which provides URL encoding and decoding. - */ -@interface OFString (OFURLEncoding) -/** - * Encodes a string for use in a URL. - * - * \return A new autoreleased string - */ -- (OFString*)stringByURLEncoding; - -/** - * Decodes a string used in a URL. - * - * \return A new autoreleased string - */ -- (OFString*)stringByURLDecoding; -@end DELETED src/OFURLEncoding.m Index: src/OFURLEncoding.m ================================================================== --- src/OFURLEncoding.m +++ src/OFURLEncoding.m @@ -1,130 +0,0 @@ -/* - * Copyright (c) 2008 - 2010 - * Jonathan Schleifer - * - * All rights reserved. - * - * This file is part of ObjFW. It may be distributed under the terms of the - * Q Public License 1.0, which can be found in the file LICENSE included in - * the packaging of this file. - */ - -#include "config.h" - -#include -#include -#include - -#import "OFURLEncoding.h" -#import "OFExceptions.h" - -/* Reference for static linking */ -int _OFURLEncoding_reference; - -@implementation OFString (OFURLEncoding) -- (OFString*)stringByURLEncoding -{ - const char *s; - char *ret_c; - size_t i; - OFString *ret; - - s = string; - - /* - * Worst case: 3 times longer than before. - * Oh, and we can't use [self allocWithSize:] here as self might be a - * @"" literal. - */ - if ((ret_c = malloc((length * 3) + 1)) == NULL) - @throw [OFOutOfMemoryException newWithClass: isa - size: (length * 3) + 1]; - - for (i = 0; *s != '\0'; s++) { - if (isalnum((int)*s) || *s == '-' || *s == '_' || *s == '.' || - *s == '~') - ret_c[i++] = *s; - else { - uint8_t high, low; - - high = *s >> 4; - low = *s & 0x0F; - - ret_c[i++] = '%'; - ret_c[i++] = (high > 9 ? high - 10 + 'A' : high + '0'); - ret_c[i++] = (low > 9 ? low - 10 + 'A' : low + '0'); - } - } - - @try { - ret = [OFString stringWithCString: ret_c - length: i]; - } @finally { - free(ret_c); - } - - return ret; -} - -- (OFString*)stringByURLDecoding -{ - const char *s; - char *ret_c, c; - size_t i; - int st; - OFString *ret; - - s = string; - - if ((ret_c = malloc(length + 1)) == NULL) - @throw [OFOutOfMemoryException newWithClass: isa - size: length + 1]; - - for (st = 0, i = 0, c = 0; *s; s++) { - switch (st) { - case 0: - if (*s == '%') - st = 1; - else if (*s == '+') - ret_c[i++] = ' '; - else - ret_c[i++] = *s; - break; - case 1: - case 2: - if (*s >= '0' && *s <= '9') - c += (*s - '0') << (st == 1 ? 4 : 0); - else if (*s >= 'A' && *s <= 'F') - c += (*s - 'A' + 10) << (st == 1 ? 4 : 0); - else if (*s >= 'a' && *s <= 'f') - c += (*s - 'a' + 10) << (st == 1 ? 4 : 0); - else { - free(ret_c); - @throw [OFInvalidEncodingException - newWithClass: isa]; - } - - if (++st == 3) { - ret_c[i++] = c; - st = 0; - c = 0; - } - - break; - } - } - ret_c[i] = '\0'; - - if (st) { - free(ret_c); - @throw [OFInvalidEncodingException newWithClass: isa]; - } - - @try { - ret = [OFString stringWithCString: ret_c]; - } @finally { - free(ret_c); - } - return ret; -} -@end ADDED src/OFXMLAttribute.h Index: src/OFXMLAttribute.h ================================================================== --- src/OFXMLAttribute.h +++ src/OFXMLAttribute.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#import "OFObject.h" + +@class OFString; + +/** + * \brief A representation of an attribute of an XML element as an object. + */ +@interface OFXMLAttribute: OFObject +{ + OFString *name; + OFString *namespace; + OFString *stringValue; +} + +#ifdef OF_HAVE_PROPERTIES +@property (readonly, retain) OFString *name; +@property (readonly, retain) OFString *namespace; +@property (readonly, retain) OFString *stringValue; +#endif + +/** + * \param name The name of the attribute + * \param ns The namespace of the attribute + * \param value The string value of the attribute + * \return A new autoreleased OFXMLAttribute with the specified parameters + */ ++ attributeWithName: (OFString*)name + namespace: (OFString*)ns + stringValue: (OFString*)value; + +/** + * Initializes an already allocated OFXMLAttribute. + * + * \param name The name of the attribute + * \param ns The namespace of the attribute + * \param value The string value of the attribute + * \return An initialized OFXMLAttribute with the specified parameters + */ +- initWithName: (OFString*)name + namespace: (OFString*)ns + stringValue: (OFString*)value; + +/** + * \return The name of the attribute as an autoreleased OFString + */ +- (OFString*)name; + +/** + * \return The namespace of the attribute as an autoreleased OFString + */ +- (OFString*)namespace; + +/** + * \return The string value of the attribute as an autoreleased OFString + */ +- (OFString*)stringValue; +@end ADDED src/OFXMLAttribute.m Index: src/OFXMLAttribute.m ================================================================== --- src/OFXMLAttribute.m +++ src/OFXMLAttribute.m @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#import "OFXMLAttribute.h" +#import "OFString.h" +#import "OFAutoreleasePool.h" + +@implementation OFXMLAttribute ++ attributeWithName: (OFString*)name + namespace: (OFString*)ns + stringValue: (OFString*)value +{ + return [[[self alloc] initWithName: name + namespace: ns + stringValue: value] autorelease]; +} + +- initWithName: (OFString*)name_ + namespace: (OFString*)ns + stringValue: (OFString*)value +{ + self = [super init]; + + name = [name_ copy]; + namespace = [ns copy]; + stringValue = [value copy]; + + return self; +} + +- (void)dealloc +{ + [name release]; + [namespace release]; + [stringValue release]; + + [super dealloc]; +} + +- (OFString*)name +{ + return [[name copy] autorelease]; +} + +- (OFString*)namespace +{ + return [[namespace copy] autorelease]; +} + +- (OFString*)stringValue +{ + return [[stringValue copy] autorelease]; +} +@end Index: src/OFXMLElement.h ================================================================== --- src/OFXMLElement.h +++ src/OFXMLElement.h @@ -8,77 +8,16 @@ * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" -#import "OFString.h" +@class OFString; @class OFMutableArray; @class OFMutableDictionary; - -extern int _OFXMLElement_reference; - -/** - * \brief A representation of an attribute of an XML element as an object. - */ -@interface OFXMLAttribute: OFObject -{ - OFString *name; - OFString *namespace; - OFString *stringValue; -} - -#ifdef OF_HAVE_PROPERTIES -@property (readonly, retain) OFString *name; -@property (readonly, retain) OFString *namespace; -@property (readonly, retain) OFString *stringValue; -#endif - -/** - * \param name The name of the attribute - * \param ns The namespace of the attribute - * \param value The string value of the attribute - * \return A new autoreleased OFXMLAttribute with the specified parameters - */ -+ attributeWithName: (OFString*)name - namespace: (OFString*)ns - stringValue: (OFString*)value; - -/** - * Initializes an already allocated OFXMLAttribute. - * - * \param name The name of the attribute - * \param ns The namespace of the attribute - * \param value The string value of the attribute - * \return An initialized OFXMLAttribute with the specified parameters - */ -- initWithName: (OFString*)name - namespace: (OFString*)ns - stringValue: (OFString*)value; - -/** - * \return The name of the attribute as an autoreleased OFString - */ -- (OFString*)name; - -/** - * \return The namespace of the attribute as an autoreleased OFString - */ -- (OFString*)namespace; - -/** - * \return The string value of the attribute as an autoreleased OFString - */ -- (OFString*)stringValue; -@end - -/** - * \brief A representation of an XML element as an object. - * - * The OFXMLElement represents an XML element as an object which can be - * modified and converted back to XML again. - */ +@class OFXMLAttribute; + @interface OFXMLElement: OFObject { OFString *name; OFString *namespace; OFString *defaultNamespace; @@ -224,17 +163,5 @@ * * \param child Another OFXMLElement which is added as a child */ - (void)addChild: (OFXMLElement*)child; @end - -/** - * \brief A category to escape strings for use in an XML document. - */ -@interface OFString (OFXMLEscaping) -/** - * Escapes a string for use in an XML document. - * - * \return A new autoreleased string - */ -- (OFString*)stringByXMLEscaping; -@end Index: src/OFXMLElement.m ================================================================== --- src/OFXMLElement.m +++ src/OFXMLElement.m @@ -10,70 +10,20 @@ */ #include "config.h" #include -#include #include #import "OFXMLElement.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" +#import "OFXMLAttribute.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" -int _OFXMLElement_reference; - -@implementation OFXMLAttribute -+ attributeWithName: (OFString*)name - namespace: (OFString*)ns - stringValue: (OFString*)value -{ - return [[[self alloc] initWithName: name - namespace: ns - stringValue: value] autorelease]; -} - -- initWithName: (OFString*)name_ - namespace: (OFString*)ns - stringValue: (OFString*)value -{ - self = [super init]; - - name = [name_ copy]; - namespace = [ns copy]; - stringValue = [value copy]; - - return self; -} - -- (void)dealloc -{ - [name release]; - [namespace release]; - [stringValue release]; - - [super dealloc]; -} - -- (OFString*)name -{ - return [[name copy] autorelease]; -} - -- (OFString*)namespace -{ - return [[namespace copy] autorelease]; -} - -- (OFString*)stringValue -{ - return [[stringValue copy] autorelease]; -} -@end - @implementation OFXMLElement + elementWithName: (OFString*)name_ { return [[[self alloc] initWithName: name_] autorelease]; } @@ -418,79 +368,6 @@ [namespaces release]; [children release]; [super dealloc]; } -@end - -@implementation OFString (OFXMLEscaping) -- (OFString*)stringByXMLEscaping -{ - char *str_c, *append, *tmp; - size_t len, append_len; - size_t i, j; - OFString *ret; - - j = 0; - len = length; - - /* - * We can't use allocMemoryWithSize: here as it might be a @"" literal - */ - if ((str_c = malloc(len)) == NULL) - @throw [OFOutOfMemoryException newWithClass: isa - size: len]; - - for (i = 0; i < length; i++) { - switch (string[i]) { - case '<': - append = "<"; - append_len = 4; - break; - case '>': - append = ">"; - append_len = 4; - break; - case '"': - append = """; - append_len = 6; - break; - case '\'': - append = "'"; - append_len = 6; - break; - case '&': - append = "&"; - append_len = 5; - break; - default: - append = NULL; - append_len = 0; - } - - if (append != NULL) { - if ((tmp = realloc(str_c, len + append_len)) == NULL) { - free(str_c); - @throw [OFOutOfMemoryException - newWithClass: isa - size: len + append_len]; - } - str_c = tmp; - len += append_len - 1; - - memcpy(str_c + j, append, append_len); - j += append_len; - } else - str_c[j++] = string[i]; - } - - assert(j == len); - - @try { - ret = [OFString stringWithCString: str_c - length: len]; - } @finally { - free(str_c); - } - return ret; -} @end Index: src/OFXMLParser.h ================================================================== --- src/OFXMLParser.h +++ src/OFXMLParser.h @@ -9,12 +9,11 @@ * the packaging of this file. */ #import "OFObject.h" #import "OFString.h" - -extern int _OFXMLParser_reference; +#import "OFXMLAttribute.h" @class OFXMLParser; @class OFArray; @class OFMutableArray; @@ -83,34 +82,17 @@ */ - (OFString*)xmlParser: (OFXMLParser*)parser didFindUnknownEntityNamed: (OFString*)entity; @end -/** - * \brief A protocol that needs to be implemented by delegates for - * -[stringByXMLUnescapingWithHandler:]. - */ -@protocol OFXMLUnescapingDelegate -/** - * This callback is called when an unknown entity was found while trying to - * unescape XML. The callback is supposed to return a substitution for the - * entity or nil if it is unknown to the callback as well, in which case an - * exception will be thrown. - * - * \param entity The name of the entity that is unknown - * \return A substitution for the entity or nil - */ -- (OFString*)didFindUnknownEntityNamed: (OFString*)entity; -@end - /** * \brief An event-based XML parser. * * OFXMLParser is an event-based XML parser which calls the delegate's callbacks * as soon asit finds something, thus suitable for streams as well. */ -@interface OFXMLParser: OFObject +@interface OFXMLParser: OFObject { OFObject *delegate; enum { OF_XMLPARSER_OUTSIDE_TAG, OF_XMLPARSER_TAG_OPENED, @@ -177,26 +159,7 @@ */ - (void)parseBuffer: (const char*)buf withSize: (size_t)size; @end -/** - * \brief A category for unescaping XML in strings. - */ -@interface OFString (OFXMLUnescaping) -/** - * Unescapes XML in the string. - */ -- (OFString*)stringByXMLUnescaping; - -/** - * Unescapes XML in the string and uses the specified handler for unknown - * entities. - * - * \param h An OFXMLUnescapingDelegate as a handler for unknown entities - */ -- (OFString*)stringByXMLUnescapingWithHandler: - (OFObject *)h; -@end - @interface OFObject (OFXMLParserDelegate) @end Index: src/OFXMLParser.m ================================================================== --- src/OFXMLParser.m +++ src/OFXMLParser.m @@ -16,19 +16,18 @@ #import "OFXMLParser.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" +#import "OFXMLAttribute.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "macros.h" -int _OFXMLParser_reference; - static OF_INLINE OFString* transform_string(OFMutableString *cache, - OFObject *handler) + OFObject *handler) { [cache replaceOccurrencesOfString: @"\r\n" withString: @"\n"]; [cache replaceOccurrencesOfString: @"\r" withString: @"\n"]; @@ -52,58 +51,10 @@ } return nil; } -static OF_INLINE OFString* -parse_numeric_entity(const char *entity, size_t length) -{ - of_unichar_t c; - size_t i; - char buf[5]; - - if (length == 1 || *entity != '#') - return nil; - - c = 0; - entity++; - length--; - - if (entity[0] == 'x') { - if (length == 1) - return nil; - - entity++; - length--; - - for (i = 0; i < length; i++) { - if (entity[i] >= '0' && entity[i] <= '9') - c = (c << 4) + (entity[i] - '0'); - else if (entity[i] >= 'A' && entity[i] <= 'F') - c = (c << 4) + (entity[i] - 'A' + 10); - else if (entity[i] >= 'a' && entity[i] <= 'f') - c = (c << 4) + (entity[i] - 'a' + 10); - else - return nil; - } - } else { - for (i = 0; i < length; i++) { - if (entity[i] >= '0' && entity[i] <= '9') - c = (c * 10) + (entity[i] - '0'); - else - return nil; - } - } - - if ((i = of_string_unicode_to_utf8(c, buf)) == 0) - return nil; - buf[i] = 0; - - return [OFString stringWithCString: buf - length: i]; -} - @implementation OFXMLParser + xmlParser { return [[[self alloc] init] autorelease]; } @@ -686,109 +637,10 @@ - (OFString*)didFindUnknownEntityNamed: (OFString*)entity { return [delegate xmlParser: self didFindUnknownEntityNamed: entity]; } -@end - -@implementation OFString (OFXMLUnescaping) -- (OFString*)stringByXMLUnescaping -{ - return [self stringByXMLUnescapingWithHandler: nil]; -} - -- (OFString*)stringByXMLUnescapingWithHandler: - (OFObject *)h -{ - size_t i, last; - BOOL in_entity; - OFMutableString *ret; - - last = 0; - in_entity = NO; - ret = [OFMutableString string]; - - switch (of_string_check_utf8(string, length)) { - case 1: - ((OFString*)ret)->isUTF8 = YES; - break; - case -1: - @throw [OFInvalidEncodingException newWithClass: isa]; - } - - for (i = 0; i < length; i++) { - if (!in_entity && string[i] == '&') { - [ret appendCStringWithoutUTF8Checking: string + last - length: i - last]; - - last = i + 1; - in_entity = YES; - } else if (in_entity && string[i] == ';') { - char *entity = string + last; - size_t len = i - last; - - if (len == 2 && !memcmp(entity, "lt", 2)) - [ret appendCStringWithoutUTF8Checking: "<" - length: 1]; - else if (len == 2 && !memcmp(entity, "gt", 2)) - [ret appendCStringWithoutUTF8Checking: ">" - length: 1]; - else if (len == 4 && !memcmp(entity, "quot", 4)) - [ret appendCStringWithoutUTF8Checking: "\"" - length: 1]; - else if (len == 4 && !memcmp(entity, "apos", 4)) - [ret appendCStringWithoutUTF8Checking: "'" - length: 1]; - else if (len == 3 && !memcmp(entity, "amp", 3)) - [ret appendCStringWithoutUTF8Checking: "&" - length: 1]; - else if (entity[0] == '#') { - OFAutoreleasePool *pool; - OFString *tmp; - - pool = [[OFAutoreleasePool alloc] init]; - tmp = parse_numeric_entity(entity, len); - - if (tmp == nil) - @throw [OFInvalidEncodingException - newWithClass: isa]; - - [ret appendString: tmp]; - [pool release]; - } else if (h != nil) { - OFAutoreleasePool *pool; - OFString *n, *tmp; - - pool = [[OFAutoreleasePool alloc] init]; - - n = [OFString stringWithCString: entity - length: len]; - tmp = [h didFindUnknownEntityNamed: n]; - - if (tmp == nil) - @throw [OFInvalidEncodingException - newWithClass: isa]; - - [ret appendString: tmp]; - [pool release]; - } else - @throw [OFInvalidEncodingException - newWithClass: isa]; - - last = i + 1; - in_entity = NO; - } - } - - if (in_entity) - @throw [OFInvalidEncodingException newWithClass: isa]; - - [ret appendCStringWithoutUTF8Checking: string + last - length: i - last]; - - return ret; -} @end @implementation OFObject (OFXMLParserDelegate) - (void)xmlParser: (OFXMLParser*)parser didStartTagWithName: (OFString*)name Index: tests/Makefile ================================================================== --- tests/Makefile +++ tests/Makefile @@ -5,15 +5,16 @@ PROG_NOINST = tests${PROG_SUFFIX} SRCS = OFArrayTests.m \ OFDataArrayTests.m \ OFDictionaryTests.m \ OFFileTests.m \ - OFHashTests.m \ OFListTests.m \ + OFMD5HashTests.m \ OFNumberTests.m \ OFObjectTests.m \ ${OFPLUGINTESTS_M} \ + OFSHA1HashTests.m \ OFStreamTests.m \ OFStringTests.m \ OFTCPSocketTests.m \ ${OFTHREADTESTS_M} \ OFXMLElementTests.m \ DELETED tests/OFHashTests.m Index: tests/OFHashTests.m ================================================================== --- tests/OFHashTests.m +++ tests/OFHashTests.m @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2008 - 2010 - * Jonathan Schleifer - * - * All rights reserved. - * - * This file is part of ObjFW. It may be distributed under the terms of the - * Q Public License 1.0, which can be found in the file LICENSE included in - * the packaging of this file. - */ - -#include "config.h" - -#include - -#import "OFHash.h" -#import "OFFile.h" -#import "OFAutoreleasePool.h" -#import "OFString.h" -#import "OFExceptions.h" - -#import "TestsAppDelegate.h" - -static OFString *module = @"OFHash"; - -const uint8_t testfile_md5[OF_MD5_DIGEST_SIZE] = - "\x00\x8B\x9D\x1B\x58\xDF\xF8\xFE\xEE\xF3\xAE\x8D\xBB\x68\x2D\x38"; -const uint8_t testfile_sha1[OF_SHA1_DIGEST_SIZE] = - "\xC9\x9A\xB8\x7E\x1E\xC8\xEC\x65\xD5\xEB\xE4\x2E\x0D\xA6\x80\x96\xF5" - "\x94\xE7\x17"; - -@implementation TestsAppDelegate (OFHashTests) -- (void)hashTests -{ - OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; - OFMD5Hash *md5; - OFSHA1Hash *sha1; - OFFile *f = [OFFile fileWithPath: @"testfile.bin" - mode: @"rb"]; - - TEST(@"+[md5Hash]", (md5 = [OFMD5Hash md5Hash])) - - TEST(@"+[sha1Hash]", (sha1 = [OFSHA1Hash sha1Hash])) - - while (![f atEndOfStream]) { - char buf[64]; - size_t len = [f readNBytes: 64 - intoBuffer: buf]; - [md5 updateWithBuffer: buf - ofSize: len]; - [sha1 updateWithBuffer: buf - ofSize: len]; - } - [f close]; - - TEST(@"-[digest]", - !memcmp([md5 digest], testfile_md5, OF_MD5_DIGEST_SIZE) && - !memcmp([sha1 digest], testfile_sha1, OF_MD5_DIGEST_SIZE)) - - EXPECT_EXCEPTION(@"Detect invalid call of -[updateWithBuffer] #1", - OFHashAlreadyCalculatedException, [md5 updateWithBuffer: "" - ofSize: 1]) - EXPECT_EXCEPTION(@"Detect invalid call of -[updateWithBuffer] #2", - OFHashAlreadyCalculatedException, [sha1 updateWithBuffer: "" - ofSize: 1]) - - [pool drain]; -} -@end ADDED tests/OFMD5HashTests.m Index: tests/OFMD5HashTests.m ================================================================== --- tests/OFMD5HashTests.m +++ tests/OFMD5HashTests.m @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include + +#import "OFMD5Hash.h" +#import "OFFile.h" +#import "OFAutoreleasePool.h" +#import "OFString.h" +#import "OFExceptions.h" + +#import "TestsAppDelegate.h" + +static OFString *module = @"OFMD5Hash"; + +const uint8_t testfile_md5[OF_MD5_DIGEST_SIZE] = + "\x00\x8B\x9D\x1B\x58\xDF\xF8\xFE\xEE\xF3\xAE\x8D\xBB\x68\x2D\x38"; + +@implementation TestsAppDelegate (OFMD5HashTests) +- (void)MD5HashTests +{ + OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; + OFMD5Hash *md5; + OFFile *f = [OFFile fileWithPath: @"testfile.bin" + mode: @"rb"]; + + TEST(@"+[md5Hash]", (md5 = [OFMD5Hash md5Hash])) + + + while (![f atEndOfStream]) { + char buf[64]; + size_t len = [f readNBytes: 64 + intoBuffer: buf]; + [md5 updateWithBuffer: buf + ofSize: len]; + } + [f close]; + + TEST(@"-[digest]", + !memcmp([md5 digest], testfile_md5, OF_MD5_DIGEST_SIZE)) + + EXPECT_EXCEPTION(@"Detect invalid call of -[updateWithBuffer]", + OFHashAlreadyCalculatedException, [md5 updateWithBuffer: "" + ofSize: 1]) + + [pool drain]; +} +@end ADDED tests/OFSHA1HashTests.m Index: tests/OFSHA1HashTests.m ================================================================== --- tests/OFSHA1HashTests.m +++ tests/OFSHA1HashTests.m @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2008 - 2010 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE included in + * the packaging of this file. + */ + +#include "config.h" + +#include + +#import "OFSHA1Hash.h" +#import "OFFile.h" +#import "OFAutoreleasePool.h" +#import "OFString.h" +#import "OFExceptions.h" + +#import "TestsAppDelegate.h" + +static OFString *module = @"OFHash"; + +const uint8_t testfile_sha1[OF_SHA1_DIGEST_SIZE] = + "\xC9\x9A\xB8\x7E\x1E\xC8\xEC\x65\xD5\xEB\xE4\x2E\x0D\xA6\x80\x96\xF5" + "\x94\xE7\x17"; + +@implementation TestsAppDelegate (SHA1HashTests) +- (void)SHA1HashTests +{ + OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; + OFSHA1Hash *sha1; + OFFile *f = [OFFile fileWithPath: @"testfile.bin" + mode: @"rb"]; + + TEST(@"+[sha1Hash]", (sha1 = [OFSHA1Hash sha1Hash])) + + while (![f atEndOfStream]) { + char buf[64]; + size_t len = [f readNBytes: 64 + intoBuffer: buf]; + [sha1 updateWithBuffer: buf + ofSize: len]; + } + [f close]; + + TEST(@"-[digest]", + !memcmp([sha1 digest], testfile_sha1, OF_SHA1_DIGEST_SIZE)) + + EXPECT_EXCEPTION(@"Detect invalid call of -[updateWithBuffer]", + OFHashAlreadyCalculatedException, [sha1 updateWithBuffer: "" + ofSize: 1]) + + [pool drain]; +} +@end Index: tests/OFStringTests.m ================================================================== --- tests/OFStringTests.m +++ tests/OFStringTests.m @@ -22,11 +22,11 @@ static OFString* whitespace[] = { @" \r \t\n\t \tasd \t \t\t\r\n", @" \t\t \t\t \t \t" }; -@interface EntityHandler: OFObject +@interface EntityHandler: OFObject @end @implementation EntityHandler - (OFString*)didFindUnknownEntityNamed: (OFString*)entity { Index: tests/TestsAppDelegate.h ================================================================== --- tests/TestsAppDelegate.h +++ tests/TestsAppDelegate.h @@ -81,17 +81,17 @@ @interface TestsAppDelegate (OFFileTests) - (void)fileTests; @end -@interface TestsAppDelegate (OFHashTests) -- (void)hashTests; -@end - @interface TestsAppDelegate (OFListTests) - (void)listTests; @end + +@interface TestsAppDelegate (OFMD5HashTests) +- (void)MD5HashTests; +@end @interface TestsAppDelegate (OFNumberTests) - (void)numberTests; @end @@ -104,10 +104,14 @@ @end @interface TestsAppDelegate (PropertiesTests) - (void)propertiesTests; @end + +@interface TestsAppDelegate (OFSHA1HashTests) +- (void)SHA1HashTests; +@end @interface TestsAppDelegate (OFStreamTests) - (void)streamTests; @end Index: tests/TestsAppDelegate.m ================================================================== --- tests/TestsAppDelegate.m +++ tests/TestsAppDelegate.m @@ -77,11 +77,12 @@ - (void)applicationDidFinishLaunching { [self objectTests]; [self stringTests]; [self fileTests]; - [self hashTests]; + [self MD5HashTests]; + [self SHA1HashTests]; [self dataArrayTests]; [self arrayTests]; [self dictionaryTests]; [self listTests]; [self numberTests];