Changes In Branch 0.3 Excluding Merge-Ins
This is equivalent to a diff from 6b4749adcc to ea546fda89
2011-05-02
| ||
00:51 | Close 0.3 branch. Closed-Leaf check-in: ea546fda89 user: js tags: 0.3 | |
2010-06-19
| ||
16:56 | Set version to 0.3.1 in 0.3 branch. check-in: 1b52853e4d user: js tags: 0.3, 0.3.1-release | |
2010-04-30
| ||
14:19 | Bump version to 0.4-dev. check-in: 0a92d8b607 user: js tags: trunk | |
14:16 | Branch for 0.3. check-in: 7c4399b41c user: js tags: 0.3 | |
14:12 | Fix "make tarball" for new paths. check-in: 6b4749adcc user: js tags: trunk | |
13:59 | Documentation improvement (replaced "an uint*" with "a uint*"). check-in: e259d77a62 user: js tags: trunk | |
Modified ChangeLog from [e54750ee89] to [efaefffd2e].
1 2 3 4 5 6 7 8 9 10 11 | Legend: * Changes of existing features or bugfixes. + New features. ObjFW 0.2 -> 0.2.1, 14.03.2010 * Fix for OFNumbers not doing calculations. * Improved -[hash] for OFNumbers with floats and doubles. + Tests for OFNumber. * Small optimization for OFArray's -[componentsJoinedByString:]. * Documentation improvements. * Updated copyright. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | Legend: * Changes of existing features or bugfixes. + New features. ObjFW 0.3 -> 0.3.1, 19.06.2010 * Fix a typo in OFMutableDictionary that prevented termination in case the last bucket is already used when the dictionary is resized. * The mutations pointer is now correctly initialized in enumerators for immutable collections. * The objc_sync test was still using the old threads API and was updated to use the new one now. * PLATFORMS has been updated to be more specific. ObjFW 0.2.1 -> 0.3, 09.05.2010 + Many new methods were added to different classes. + A huge amount of methods was added to OFStream, allowing easy binary stream handling and even mixing string-based and binary operations. + An optional write buffer was added to OFStream. + OFSeekableStream was added for streams that allow seeking, for example OFFiles. * OFNumber was completely reworked and got many new features now. * Large parts of OFDictionary were rewritten for better readability, better memory usage and to fix a bug with removing objects. * OFThread has been greatly improved. * Many small optimizations. * Many documentation improvements. * Method replacing was reworked and the methods renamed. + Tests for OFStream were added. * A bug with building ObjFW as a Universal Binary Framework was fixed. + Support for ObjFW-RT, the ObjFW Objective C runtime, was added. * Sockets are now properly closed before an exception is thrown. * Error handling with sockets was improved. * OFFile now uses open(), read() and write(), thus allowing -[readLine] to be used on of_stdin and fixing many other annoyances. * A few misc methods were renamed. + OFApplication was added. * All tests and the table generator are now using OFApplication. + It is now possible to get the remote address of an OFTCPSocket. + OFString can now build paths in the OS-native format. + It is now possible to create a string with the contents of a file. + Many new file operations were added to OFFile. * The existing file operations in OFFile were improved. * Almost all functions that returned self before now return void. + OFHash was added as a superclass for OFMD5Hash and OFSHA1Hash and OFHashes renamed to OFHash. + objfw-compile was added for easy compilation of ObjFW projects, which includes dependency checking for headers etc. * The instance variable naming convention was changed so that properties work. + Properties were added to the interfaces and are used if they are supported by the compiler. + The library version is now included in the resulting dylib and libobjc is reexported now. Additionally, objfw-config offers --reexport now to produce libraries that link against ObjFW and reexport it. ObjFW 0.2 -> 0.2.1, 14.03.2010 * Fix for OFNumbers not doing calculations. * Improved -[hash] for OFNumbers with floats and doubles. + Tests for OFNumber. * Small optimization for OFArray's -[componentsJoinedByString:]. * Documentation improvements. * Updated copyright. |
︙ | ︙ |
Modified Info.plist from [f725cf10a8] to [04150c9085].
1 2 3 4 5 6 7 8 | <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> <string>ObjFW</string> | | | | < < < < | | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> <string>ObjFW</string> <key>CFBundleName</key> <string>ObjFW</string> <key>CFBundleIdentifier</key> <string>org.webkeks.objfw</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleSignature</key> <string>OBJFW</string> <key>CFBundleVersion</key> <string>0.3.1</string> <key>CFBundleShortVersionString</key> <string>0.3.1</string> </dict> </plist> |
Modified PLATFORMS from [8d9a4a948b] to [31b43e99c6].
1 2 3 | ObjFW is known to work on the following platforms, but should run on many others as well: | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ObjFW is known to work on the following platforms, but should run on many others as well: +--------------------------+--------------+----------------------+---------+ | OS | Architecture | Compiler | Runtime | +--------------------------+--------------+----------------------+---------+ | FreeBSD 8.0 | x86 | | GNU | +--------------------------+--------------+----------------------+---------+ | Linux 2.6.* | x86 | gcc 4.4.1 | GNU | | Linux 2.6.* | x86 | llvm/clang r83252 | GNU | | Linux 2.6.* | x86_64 | gcc 4.4.1 | GNU | +--------------------------+--------------+----------------------+---------+ | iPhone OS 2.2.1 - 3.1.2 | arm | gcc 4.2 | Apple | | Mac OS X 10.5 | ppc | gcc 4.0 + 4.2 | Apple | | Mac OS X 10.5 | ppc64 | gcc 4.0 + 4.2 | Apple | | Mac OS X 10.5 - 10.6 | x86 | gcc 4.0 + 4.2 | Apple | | Mac OS X 10.5 - 10.6 | x86_64 | gcc 4.0 + 4.2 | Apple | +--------------------------+--------------+----------------------+---------+ | MirBSD 10uAB | x86 | gcc 4.4.2 | GNU | +--------------------------+--------------+----------------------+---------+ | NetBSD 4.0 | x86 | gcc 4.1.2 prerelease | GNU | +--------------------------+--------------+----------------------+---------+ | OpenBSD 4.6 | x86_64 | gcc 4.2.4 | GNU | +--------------------------+--------------+----------------------+---------+ | OpenSolaris 2009.06 | x86 | | GNU | | OpenSolaris 2009.06 | x86_64 | | GNU | +--------------------------+--------------+----------------------+---------+ | Windows XP - 7 / cygwin | x86 | | GNU | | Windows XP - 7 / mingw32 | x86 | | GNU | +--------------------------+--------------+----------------------+---------+ Basically, it should run on any POSIX system to which gcc4 or a recent clang version has been ported. If not, please send an e-mail with a bug report. |
Modified configure.ac from [b88ff9afd8] to [6b2e70dfe8].
|
| | | 1 2 3 4 5 6 7 8 | AC_INIT(ObjFW, 0.3.1, js@webkeks.org) AC_CONFIG_SRCDIR(src) AC_CANONICAL_HOST AC_LANG([Objective C]) AC_PROG_OBJC AC_PROG_OBJCPP |
︙ | ︙ | |||
119 120 121 122 123 124 125 126 127 128 129 130 131 132 | if test x"$PLUGIN_SUFFIX" != "x"; then AC_SUBST(OFPLUGIN_M, "OFPlugin.m") AC_SUBST(OFPLUGINTESTS_M, "OFPluginTests.m") AC_SUBST(TESTPLUGIN, "plugin") AC_DEFINE(OF_PLUGINS, 1, [Whether we have plugin support]) AC_SUBST(OFPLUGINS_DEF, "-DOF_PLUGINS") fi AC_C_BIGENDIAN([ AC_DEFINE(OF_BIG_ENDIAN, 1, [Whether we are big endian]) AC_SUBST(ENDIANESS_DEF, "-DOF_BIG_ENDIAN")]) AC_MSG_CHECKING(for SIZE_MAX) AC_EGREP_CPP(yes, [ | > > > > > > > | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | if test x"$PLUGIN_SUFFIX" != "x"; then AC_SUBST(OFPLUGIN_M, "OFPlugin.m") AC_SUBST(OFPLUGINTESTS_M, "OFPluginTests.m") AC_SUBST(TESTPLUGIN, "plugin") AC_DEFINE(OF_PLUGINS, 1, [Whether we have plugin support]) AC_SUBST(OFPLUGINS_DEF, "-DOF_PLUGINS") fi case "$host_os" in darwin*) AC_SUBST(REEXPORT_LIBOBJC, [-Wl,-reexport-lobjc]) AC_SUBST(LDFLAGS_REEXPORT, [-Wl,-reexport-lobjfw]) ;; esac AC_C_BIGENDIAN([ AC_DEFINE(OF_BIG_ENDIAN, 1, [Whether we are big endian]) AC_SUBST(ENDIANESS_DEF, "-DOF_BIG_ENDIAN")]) AC_MSG_CHECKING(for SIZE_MAX) AC_EGREP_CPP(yes, [ |
︙ | ︙ | |||
404 405 406 407 408 409 410 | AC_SUBST(CPP) AC_SUBST(CPPFLAGS) AC_SUBST(PACKAGE, ObjFW) AC_CONFIG_FILES([buildsys.mk extra.mk utils/objfw-config]) AC_CONFIG_HEADERS([config.h src/objfw-defs.h]) AC_OUTPUT | < < < < < < < | 411 412 413 414 415 416 417 | AC_SUBST(CPP) AC_SUBST(CPPFLAGS) AC_SUBST(PACKAGE, ObjFW) AC_CONFIG_FILES([buildsys.mk extra.mk utils/objfw-config]) AC_CONFIG_HEADERS([config.h src/objfw-defs.h]) AC_OUTPUT |
Modified extra.mk.in from [ea8c58d171] to [100b41fa7b].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | OBJFW_LIB_MAJOR = 2 OBJFW_LIB_MINOR = 0 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} ASPRINTF_M = @ASPRINTF_M@ ATOMIC_H = @ATOMIC_H@ OBJC_PROPERTIES_M = @OBJC_PROPERTIES_M@ OBJC_SYNC_M = @OBJC_SYNC_M@ OFPLUGIN_M = @OFPLUGIN_M@ OFPLUGINTESTS_M = @OFPLUGINTESTS_M@ OFTHREAD_M = @OFTHREAD_M@ OFTHREADTESTS_M = @OFTHREADTESTS_M@ PROPERTIESTESTS_M = @PROPERTIESTESTS_M@ TESTPLUGIN = @TESTPLUGIN@ TESTS = @TESTS@ TEST_LAUNCHER = @TEST_LAUNCHER@ THREADING_H = @THREADING_H@ | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | OBJFW_LIB_MAJOR = 2 OBJFW_LIB_MINOR = 0 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} ASPRINTF_M = @ASPRINTF_M@ ATOMIC_H = @ATOMIC_H@ OBJC_PROPERTIES_M = @OBJC_PROPERTIES_M@ OBJC_SYNC_M = @OBJC_SYNC_M@ OFPLUGIN_M = @OFPLUGIN_M@ OFPLUGINTESTS_M = @OFPLUGINTESTS_M@ OFTHREAD_M = @OFTHREAD_M@ OFTHREADTESTS_M = @OFTHREADTESTS_M@ PROPERTIESTESTS_M = @PROPERTIESTESTS_M@ REEXPORT_LIBOBJC = @REEXPORT_LIBOBJC@ TESTPLUGIN = @TESTPLUGIN@ TESTS = @TESTS@ TEST_LAUNCHER = @TEST_LAUNCHER@ THREADING_H = @THREADING_H@ |
Modified m4/buildsys.m4 from [8507639fdf] to [b350cd68ec].
︙ | ︙ | |||
53 54 55 56 57 58 59 | AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(for shared library system) case "$host_os" in darwin*) AC_MSG_RESULT(Darwin) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' | | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(for shared library system) case "$host_os" in darwin*) AC_MSG_RESULT(Darwin) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}' LIB_PREFIX='lib' LIB_SUFFIX='.dylib' LDFLAGS_RPATH='-Wl,-rpath,${libdir}' PLUGIN_CPPFLAGS='-DPIC' PLUGIN_CFLAGS='-fPIC' PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup' PLUGIN_SUFFIX='.impl' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' CLEAN_LIB='' ;; solaris*) AC_MSG_RESULT(Solaris) |
︙ | ︙ |
Modified src/Makefile from [a0ae7ee314] to [a2fadbd234].
︙ | ︙ | |||
8 9 10 11 12 13 14 | OFArray.m \ OFAutoreleasePool.m \ OFConstString.m \ OFDataArray.m \ OFDictionary.m \ OFExceptions.m \ OFFile.m \ | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | OFArray.m \ OFAutoreleasePool.m \ OFConstString.m \ OFDataArray.m \ OFDictionary.m \ OFExceptions.m \ OFFile.m \ OFHash.m \ OFEnumerator.m \ OFList.m \ OFMutableArray.m \ OFMutableDictionary.m \ OFMutableString.m \ OFNumber.m \ OFObject.m \ |
︙ | ︙ | |||
47 48 49 50 51 52 53 | ${OBJC_SYNC_M} include ../buildsys.mk CPPFLAGS += -I.. ${LIB_CPPFLAGS} OBJCFLAGS += ${LIB_CFLAGS} LD = ${OBJC} | > | 47 48 49 50 51 52 53 54 | ${OBJC_SYNC_M} include ../buildsys.mk CPPFLAGS += -I.. ${LIB_CPPFLAGS} OBJCFLAGS += ${LIB_CFLAGS} LD = ${OBJC} LDFLAGS += ${REEXPORT_LIBOBJC} |
Modified src/OFArray.m from [af5a656bb6] to [38df47daa4].
︙ | ︙ | |||
370 371 372 373 374 375 376 | - initWithDataArray: (OFDataArray*)array_ mutationsPointer: (unsigned long*)mutationsPtr_; { self = [super init]; array = array_; count = [array_ count]; | | | 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 | - initWithDataArray: (OFDataArray*)array_ mutationsPointer: (unsigned long*)mutationsPtr_; { self = [super init]; array = array_; count = [array_ count]; mutations = (mutationsPtr_ != NULL ? *mutationsPtr_ : 0); mutationsPtr = mutationsPtr_; return self; } - (id)nextObject { |
︙ | ︙ |
Modified src/OFDictionary.m from [0083ef4288] to [d6200e89ce].
︙ | ︙ | |||
686 687 688 689 690 691 692 | size: (uint32_t)size_ mutationsPointer: (unsigned long*)mutationsPtr_ { self = [super init]; data = data_; size = size_; | | | 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 | size: (uint32_t)size_ mutationsPointer: (unsigned long*)mutationsPtr_ { self = [super init]; data = data_; size = size_; mutations = (mutationsPtr_ != NULL ? *mutationsPtr_ : 0); mutationsPtr = mutationsPtr_; return self; } - (void)reset { |
︙ | ︙ |
Modified src/OFExceptions.m from [1b38e5bb50] to [a94e12da30].
︙ | ︙ | |||
82 83 84 85 86 87 88 | selector: _cmd]; } - initWithClass: (Class)class_ { self = [super init]; | | | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | selector: _cmd]; } - initWithClass: (Class)class_ { self = [super init]; inClass = class_; return self; } - (void)dealloc { [string release]; |
︙ | ︙ | |||
1255 1256 1257 1258 1259 1260 1261 | - (OFString*)string { if (string != nil) return string; string = [[OFString alloc] initWithFormat: @"A connection to service %s on node %s could not be established " | | | 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 | - (OFString*)string { if (string != nil) return string; string = [[OFString alloc] initWithFormat: @"A connection to service %s on node %s could not be established " @"in class %s! " ERRFMT, [service cString], [node cString], [inClass className], ERRPARAM]; return string; } - (int)errNo { |
︙ | ︙ |
Modified src/OFFile.m from [963472770a] to [bf7134d6ef].
︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 | #ifndef S_IRGRP # define S_IRGRP 0 #endif #ifndef S_IROTH # define S_IROTH 0 #endif #define DEFAULT_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH #define DIR_MODE DEFAULT_MODE | S_IXUSR | S_IXGRP | S_IXOTH OFFile *of_stdin = nil; OFFile *of_stdout = nil; OFFile *of_stderr = nil; | > > > > > > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | #ifndef S_IRGRP # define S_IRGRP 0 #endif #ifndef S_IROTH # define S_IROTH 0 #endif #ifndef S_IWGRP # define S_IWGRP 0 #endif #ifndef S_IWOTH # define S_IWOTH 0 #endif #define DEFAULT_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH #define DIR_MODE DEFAULT_MODE | S_IXUSR | S_IXGRP | S_IXOTH OFFile *of_stdin = nil; OFFile *of_stdout = nil; OFFile *of_stderr = nil; |
︙ | ︙ | |||
112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | const char *path_c = [path cString]; size_t path_len = [path cStringLength]; ssize_t i; if (path_len == 0) return @""; if (path_c[path_len - 1] == OF_PATH_DELIM) path_len--; for (i = path_len - 1; i >= 0; i--) { if (path_c[i] == OF_PATH_DELIM) { i++; break; } } /* * Only one component, but the trailing delimiter might have been | > > > > > > > > | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | const char *path_c = [path cString]; size_t path_len = [path cStringLength]; ssize_t i; if (path_len == 0) return @""; #ifndef _WIN32 if (path_c[path_len - 1] == OF_PATH_DELIM) #else if (path_c[path_len - 1] == '/' || path_c[path_len - 1] == '\\') #endif path_len--; for (i = path_len - 1; i >= 0; i--) { #ifndef _WIN32 if (path_c[i] == OF_PATH_DELIM) { #else if (path_c[i] == '/' || path_c[i] == '\\') { #endif i++; break; } } /* * Only one component, but the trailing delimiter might have been |
︙ | ︙ | |||
314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 | while (![src atEndOfStream]) { size_t len = [src readNBytes: 4096 intoBuffer: buf]; [dest writeNBytes: len fromBuffer: buf]; } if (!override) { struct stat s; if (fstat(src->fd, &s) == 0) fchmod(dest->fd, s.st_mode); } } @finally { [src close]; [dest close]; } [pool release]; } | > > | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | while (![src atEndOfStream]) { size_t len = [src readNBytes: 4096 intoBuffer: buf]; [dest writeNBytes: len fromBuffer: buf]; } #ifndef _WIN32 if (!override) { struct stat s; if (fstat(src->fd, &s) == 0) fchmod(dest->fd, s.st_mode); } #endif } @finally { [src close]; [dest close]; } [pool release]; } |
︙ | ︙ |
Added src/OFHash.h version [c880c1bfa4].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | /* * Copyright (c) 2008 - 2010 * Jonathan Schleifer <js@webkeks.org> * * 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" #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 { BOOL calculated; } #ifdef OF_HAVE_PROPERTIES @property (readonly) BOOL calculated; #endif /** * Adds a buffer to the hash to be calculated. * * \param buf The buffer which should be included into the calculation. * \param size The size of the buffer */ - (void)updateWithBuffer: (const char*)buf ofSize: (size_t)size; /** * \return A buffer containing the hash. The size of the buffer is depending * on the hash used. The buffer is part of object's memory pool. */ - (uint8_t*)digest; /** * \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 |
Added src/OFHash.m version [f0a4e26a0e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 | /* * Copyright (c) 2008 - 2010 * Jonathan Schleifer <js@webkeks.org> * * 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 <string.h> #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 { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (uint8_t*)digest { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (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 |
Deleted src/OFHashes.h version [c880c1bfa4].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted src/OFHashes.m version [1aa4d93617].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified src/OFMutableDictionary.m from [5339feda90] to [c74680827d].
︙ | ︙ | |||
57 58 59 60 61 62 63 | for (; j < last && newdata[j] != NULL; j++); /* In case the last bucket is already used */ if (j >= last) { last = data[i]->hash & (newsize - 1); for (j = 0; j < last && | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | for (; j < last && newdata[j] != NULL; j++); /* In case the last bucket is already used */ if (j >= last) { last = data[i]->hash & (newsize - 1); for (j = 0; j < last && newdata[j] != NULL; j++); } if (j >= last) { [self freeMemory: newdata]; @throw [OFOutOfRangeException newWithClass: isa]; } |
︙ | ︙ |
Modified src/OFObject.h from [ed24092d00] to [edc7438bce].
︙ | ︙ | |||
136 137 138 139 140 141 142 | /** * Replaces a class method with a class method from another class. * * \param selector The selector of the class method to replace * \param class_ The class from which the new class method should be taken * \return The old implementation */ | | | | | | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | /** * Replaces a class method with a class method from another class. * * \param selector The selector of the class method to replace * \param class_ The class from which the new class method should be taken * \return The old implementation */ + (IMP)replaceClassMethod: (SEL)selector withMethodFromClass: (Class)class_; /** * Replaces an instance method implementation with another implementation. * * \param newimp The new implementation for the instance method * \param selector The selector of the instance method to replace * \return The old implementation */ + (IMP)setImplementation: (IMP)newimp forInstanceMethod: (SEL)selector; /** * Replaces an instance method with an instance method from another class. * * \param selector The selector of the instance method to replace * \param class_ The class from which the new instance method should be taken * \return The old implementation */ + (IMP)replaceInstanceMethod: (SEL)selector withMethodFromClass: (Class)class_; /** * Initializes an already allocated object. * * Derived classes may override this, but need to do self = [super init] before * they do any initialization themselves. init may never return nil, instead * an exception (for example OFInitializationFailed) should be thrown. |
︙ | ︙ |
Modified src/OFObject.m from [7e95f15bf5] to [1881ae5509].
︙ | ︙ | |||
258 259 260 261 262 263 264 | sarray_at_put_safe(((Class)self->class_pointer)->dtable, (sidx)method->method_name->sel_id, method->method_imp); return oldimp; #endif } | | | > > > > | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | sarray_at_put_safe(((Class)self->class_pointer)->dtable, (sidx)method->method_name->sel_id, method->method_imp); return oldimp; #endif } + (IMP)replaceClassMethod: (SEL)selector withMethodFromClass: (Class)class; { IMP newimp; if (![class isSubclassOfClass: self]) @throw [OFInvalidArgumentException newWithClass: self selector: _cmd]; #if defined(OF_OBJFW_RUNTIME) newimp = objc_get_class_method(class, selector); #elif defined(OF_APPLE_RUNTIME) newimp = method_getImplementation(class_getClassMethod(class, selector)); #else |
︙ | ︙ | |||
310 311 312 313 314 315 316 | sarray_at_put_safe(((Class)self)->dtable, (sidx)method->method_name->sel_id, method->method_imp); return oldimp; #endif } | | | > > > > | 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 | sarray_at_put_safe(((Class)self)->dtable, (sidx)method->method_name->sel_id, method->method_imp); return oldimp; #endif } + (IMP)replaceInstanceMethod: (SEL)selector withMethodFromClass: (Class)class; { IMP newimp; if (![class isSubclassOfClass: self]) @throw [OFInvalidArgumentException newWithClass: self selector: _cmd]; #if defined(OF_OBJFW_RUNTIME) newimp = objc_get_instance_method(class, selector); #elif defined(OF_APPLE_RUNTIME) newimp = class_getMethodImplementation(class, selector); #else newimp = method_get_imp(class_get_instance_method(class, selector)); |
︙ | ︙ |
Modified src/OFString.h from [1828092a6a] to [dc84da64f5].
︙ | ︙ | |||
366 367 368 369 370 371 372 | * \return An OFNumber */ - (uintmax_t)hexadecimalValueAsInteger; @end #import "OFConstString.h" #import "OFMutableString.h" | | | 366 367 368 369 370 371 372 373 374 375 376 | * \return An OFNumber */ - (uintmax_t)hexadecimalValueAsInteger; @end #import "OFConstString.h" #import "OFMutableString.h" #import "OFHash.h" #import "OFURLEncoding.h" #import "OFXMLElement.h" #import "OFXMLParser.h" |
Modified src/OFXMLElement.m from [d6b729bcd1] to [8ef4f9d493].
︙ | ︙ | |||
13 14 15 16 17 18 19 | #include <assert.h> #include <stdlib.h> #include <string.h> #import "OFXMLElement.h" #import "OFString.h" | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include <assert.h> #include <stdlib.h> #include <string.h> #import "OFXMLElement.h" #import "OFString.h" #import "OFExceptions.h" int _OFXMLElement_reference; @implementation OFString (OFXMLEscaping) - (OFString*)stringByXMLEscaping { char *str_c, *append, *tmp; size_t len, append_len; size_t i, j; OFString *ret; |
︙ | ︙ |
Modified src/OFXMLParser.m from [e53641c3ce] to [a0c5faabf6].
︙ | ︙ | |||
11 12 13 14 15 16 17 | #include "config.h" #include <string.h> #import "OFXMLParser.h" #import "OFString.h" | < < < < < < < < < < < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include "config.h" #include <string.h> #import "OFXMLParser.h" #import "OFString.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "macros.h" int _OFXMLParser_reference; static OF_INLINE OFString* parse_numeric_entity(const char *entity, size_t length) { of_unichar_t c; size_t i; char buf[5]; |
︙ | ︙ | |||
76 77 78 79 80 81 82 | return nil; buf[i] = 0; return [OFString stringWithCString: buf length: i]; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | return nil; buf[i] = 0; return [OFString stringWithCString: buf length: i]; } @implementation OFString (OFXMLUnescaping) - (OFString*)stringByXMLUnescaping { return [self stringByXMLUnescapingWithHandler: nil]; } - (OFString*)stringByXMLUnescapingWithHandler: |
︙ | ︙ | |||
589 590 591 592 593 594 595 596 | @throw [OFInvalidEncodingException newWithClass: isa]; [ret appendCStringWithoutUTF8Checking: string + last length: i - last]; return ret; } @end | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 162 163 164 165 166 167 168 169 | @throw [OFInvalidEncodingException newWithClass: isa]; [ret appendCStringWithoutUTF8Checking: string + last length: i - last]; return ret; } @end |
Modified src/ObjFW.h from [7f2109937b] to [491ce3d35b].
︙ | ︙ | |||
30 31 32 33 34 35 36 | #import "OFStream.h" #import "OFFile.h" #import "OFSocket.h" #import "OFTCPSocket.h" | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | #import "OFStream.h" #import "OFFile.h" #import "OFSocket.h" #import "OFTCPSocket.h" #import "OFHash.h" #import "OFXMLElement.h" #import "OFApplication.h" #import "macros.h" #ifdef OF_PLUGINS |
︙ | ︙ |
Modified src/objfw-defs.h.in from [8c68c7e68e] to [5c69853c4a].
1 2 3 4 5 6 7 8 9 10 11 12 | #undef OF_APPLE_RUNTIME #undef OF_ATOMIC_OPS #undef OF_BIG_ENDIAN #undef OF_GNU_RUNTIME #undef OF_HAVE_ASPRINTF #undef OF_HAVE_GCC_ATOMIC_OPS #undef OF_HAVE_LIBKERN_OSATOMIC_H #undef OF_HAVE_PROPERTIES #undef OF_HAVE_PTHREADS #undef OF_HAVE_PTHREAD_SPINLOCKS #undef OF_HAVE_SCHED_YIELD #undef OF_OBJFW_RUNTIME | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | #undef OF_APPLE_RUNTIME #undef OF_HAVE_ASPRINTF #undef OF_ATOMIC_OPS #undef OF_BIG_ENDIAN #undef OF_GNU_RUNTIME #undef OF_HAVE_ASPRINTF #undef OF_HAVE_FAST_ENUMERATION #undef OF_HAVE_GCC_ATOMIC_OPS #undef OF_HAVE_LIBKERN_OSATOMIC_H #undef OF_HAVE_PROPERTIES #undef OF_HAVE_PTHREADS #undef OF_HAVE_PTHREAD_SPINLOCKS #undef OF_HAVE_SCHED_YIELD #undef OF_OBJFW_RUNTIME |
︙ | ︙ |
Modified tests/Makefile from [d78b55a6da] to [3045e9a844].
1 2 3 4 5 6 7 8 9 | include ../extra.mk SUBDIRS = ${TESTPLUGIN} PROG_NOINST = tests${PROG_SUFFIX} SRCS = OFArrayTests.m \ OFDataArrayTests.m \ OFDictionaryTests.m \ OFFileTests.m \ | | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | include ../extra.mk SUBDIRS = ${TESTPLUGIN} PROG_NOINST = tests${PROG_SUFFIX} SRCS = OFArrayTests.m \ OFDataArrayTests.m \ OFDictionaryTests.m \ OFFileTests.m \ OFHashTests.m \ OFListTests.m \ OFNumberTests.m \ OFObjectTests.m \ ${OFPLUGINTESTS_M} \ OFStreamTests.m \ OFStringTests.m \ OFTCPSocketTests.m \ ${OFTHREADTESTS_M} \ ${PROPERTIESTESTS_M} \ TestsAppDelegate.m IPHONE_USER = mobile IPHONE_TMP = /tmp/objfw-test .PHONY: run run-tests run-on-iphone |
︙ | ︙ |
Modified tests/OFFileTests.m from [d67d57f93a] to [b9b8be5676].
︙ | ︙ | |||
25 26 27 28 29 30 31 | { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; TEST(@"+[lastComponentOfPath", [[OFFile lastComponentOfPath: @"/tmp"] isEqual: @"tmp"] && [[OFFile lastComponentOfPath: @"/tmp/"] isEqual: @"tmp"] && [[OFFile lastComponentOfPath: @"/"] isEqual: @""] && | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; TEST(@"+[lastComponentOfPath", [[OFFile lastComponentOfPath: @"/tmp"] isEqual: @"tmp"] && [[OFFile lastComponentOfPath: @"/tmp/"] isEqual: @"tmp"] && [[OFFile lastComponentOfPath: @"/"] isEqual: @""] && [[OFFile lastComponentOfPath: @"foo"] isEqual: @"foo"] && [[OFFile lastComponentOfPath: @"foo/bar"] isEqual: @"bar"] && [[OFFile lastComponentOfPath: @"foo/bar/baz/"] isEqual: @"baz"]) [pool drain]; } @end |
Added tests/OFHashTests.m version [b953a9142a].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | /* * Copyright (c) 2008 - 2010 * Jonathan Schleifer <js@webkeks.org> * * 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 <string.h> #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 |
Deleted tests/OFHashesTests.m version [09b698ac10].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/OFXMLElementTests.m version [a0a019906c].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/OFXMLParserTests.m version [d66604b68c].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified tests/TestsAppDelegate.h from [7e0781c6ed] to [ae0d2f9cd4].
︙ | ︙ | |||
79 80 81 82 83 84 85 | - (void)dictionaryTests; @end @interface TestsAppDelegate (OFFileTests) - (void)fileTests; @end | | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | - (void)dictionaryTests; @end @interface TestsAppDelegate (OFFileTests) - (void)fileTests; @end @interface TestsAppDelegate (OFHashTests) - (void)hashTests; @end @interface TestsAppDelegate (OFListTests) - (void)listTests; @end @interface TestsAppDelegate (OFNumberTests) |
︙ | ︙ | |||
118 119 120 121 122 123 124 | @interface TestsAppDelegate (OFTCPSocketTests) - (void)TCPSocketTests; @end @interface TestsAppDelegate (OFThreadTests) - (void)threadTests; @end | < < < < < < < < | 118 119 120 121 122 123 124 | @interface TestsAppDelegate (OFTCPSocketTests) - (void)TCPSocketTests; @end @interface TestsAppDelegate (OFThreadTests) - (void)threadTests; @end |
Modified tests/TestsAppDelegate.m from [461a2d5844] to [c1d8d106b1].
︙ | ︙ | |||
75 76 77 78 79 80 81 | } - (void)applicationDidFinishLaunching { [self objectTests]; [self stringTests]; [self fileTests]; | | < < | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | } - (void)applicationDidFinishLaunching { [self objectTests]; [self stringTests]; [self fileTests]; [self hashTests]; [self dataArrayTests]; [self arrayTests]; [self dictionaryTests]; [self listTests]; [self numberTests]; [self streamTests]; [self TCPSocketTests]; #ifdef OF_THREADS [self threadTests]; #endif #ifdef OF_PLUGINS [self pluginTests]; #endif #ifdef OF_HAVE_PROPERTIES [self propertiesTests]; #endif |
︙ | ︙ |
Modified tests/objc_sync/test.m from [53e6bbc1b9] to [935014e663].
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 | int main() { lock = [[OFObject alloc] init]; MyThread *t1 = [MyThread threadWithObject: @"A"]; MyThread *t2 = [MyThread threadWithObject: @"B"]; [t1 join]; [t2 join]; return 0; } | > > > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | int main() { lock = [[OFObject alloc] init]; MyThread *t1 = [MyThread threadWithObject: @"A"]; MyThread *t2 = [MyThread threadWithObject: @"B"]; [t1 start]; [t2 start]; [t1 join]; [t2 join]; return 0; } |
Modified utils/objfw-config.in from [d92d8227a8] to [4fac5c9043].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | #!/bin/sh prefix="@prefix@" exec_prefix="@exec_prefix@" libdir="@libdir@" CFLAGS="" CPPFLAGS="-I@includedir@" CXXFLAGS="" OBJC="@OBJC@" OBJCFLAGS="@GNU_RUNTIME@ -fexceptions -fobjc-exceptions" OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString" OBJCFLAGS="$OBJCFLAGS @NO_CONST_CFSTRINGS@ @NO_WARN_UNUSED@ @ATOMIC_OBJCFLAGS@" LDFLAGS="" LDFLAGS_RPATH="@LDFLAGS_RPATH@" LIBS="-L${libdir} -lobjfw @LIBS@" | > | > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | #!/bin/sh prefix="@prefix@" exec_prefix="@exec_prefix@" libdir="@libdir@" CFLAGS="" CPPFLAGS="-I@includedir@" CXXFLAGS="" OBJC="@OBJC@" OBJCFLAGS="@GNU_RUNTIME@ -fexceptions -fobjc-exceptions" OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString" OBJCFLAGS="$OBJCFLAGS @NO_CONST_CFSTRINGS@ @NO_WARN_UNUSED@ @ATOMIC_OBJCFLAGS@" LDFLAGS="" LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@" LDFLAGS_RPATH="@LDFLAGS_RPATH@" LIBS="-L${libdir} -lobjfw @LIBS@" VERSION="0.3.1" show_help() { cat <<__EOF__ objfw-config: Available arguments are: --all Outputs all flags + libs --cflags Outputs the required CFLAGS --cppflags Outputs the required CPPFLAGS --cxxflags Outputs the required CXXFLAGS --objc Outputs the OBJC used to compile ObjFW --objcflags Outputs the required OBJCFLAGS --ldflags Outputs the required LDFLAGS --reexport Outputs LDFLAGS to reexport ObjFW --rpath Outputs LDFLAGS for using rpath --libs Outputs the required LIBS --version Outputs the installed version __EOF__ exit 0 } test -z "$1" && show_help while test ! -z "$1"; do case "$1" in --all) echo "$CFLAGS" echo "$CPPFLAGS" echo "$CXXFLAGS" echo "$OBJCFLAGS" echo "$LDFLAGS" echo "$LDFLAGS_REEXPORT" echo "$LDFLAGS_RPATH" echo "$LIBS" ;; --cflags) echo "$CFLAGS" ;; --cppflags) echo "$CPPFLAGS" |
︙ | ︙ | |||
62 63 64 65 66 67 68 69 70 71 72 73 74 75 | ;; --libs) echo "$LIBS" ;; --ldflags) echo "$LDFLAGS" ;; --rpath) echo "$LDFLAGS_RPATH" ;; --version) echo "$VERSION" ;; *) | > > > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | ;; --libs) echo "$LIBS" ;; --ldflags) echo "$LDFLAGS" ;; --reexport) echo "$LDFLAGS_REEXPORT" ;; --rpath) echo "$LDFLAGS_RPATH" ;; --version) echo "$VERSION" ;; *) |
︙ | ︙ |