Overview
Comment: | Add OFHashes. Only MD5 so far. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
9a0cc3bc23baf47102d567f3a262836d |
User & Date: | js on 2008-10-26 02:45:59 |
Other Links: | manifest | tags |
Context
2008-10-26
| ||
02:47 | Forgot call to - free. check-in: b2df7acabb user: js tags: trunk | |
02:45 | Add OFHashes. Only MD5 so far. check-in: 9a0cc3bc23 user: js tags: trunk | |
00:08 | D'oh. check-in: f6f343580c user: js tags: trunk | |
Changes
Modified TODO from [3bc4d8c53a] to [9dfe96e62a].
1 2 3 4 5 6 7 8 9 10 | OFArray OFDictionary OFSortedArray OFSocket OFAutoreleasePool OFStack OFQueue OFXMLParser | > > < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | OFArray OFDictionary OFSortedArray OFSocket OFThread OFAutoreleasePool OFStack OFQueue OFPlugin OFXMLParser OFSortedQueue OFTLSSocket OFXMPPClient |
Modified configure.ac from [ca3e8cb004] to [977f62d996].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | OBJCFLAGS="$OBJSFLAGS -Wall -Werror -pipe -g" ;; esac OBJCFLAGS="$OBJCFLAGS -fobjc-exceptions" BUILDSYS_SHARED_LIB AC_CHECK_HEADER(objc/runtime.h, [AC_DEFINE(HAVE_OBJC_RUNTIME_H, 1, [Whether we have objc/runtime.h])]) AC_CHECK_LIB(objc, sel_get_name, [AC_DEFINE(HAVE_SEL_GET_NAME, 1, [Whether we have sel_get_name])]) AC_CHECK_LIB(objc, sel_getName, [AC_DEFINE(HAVE_SEL_GETNAME, 1, [Whether we have sel_getName])]) | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | OBJCFLAGS="$OBJSFLAGS -Wall -Werror -pipe -g" ;; esac OBJCFLAGS="$OBJCFLAGS -fobjc-exceptions" BUILDSYS_SHARED_LIB AC_C_BIGENDIAN([AC_DEFINE(BIG_ENDIAN, 1, [Whether we are big endian])]) AC_CHECK_HEADER(objc/runtime.h, [AC_DEFINE(HAVE_OBJC_RUNTIME_H, 1, [Whether we have objc/runtime.h])]) AC_CHECK_LIB(objc, sel_get_name, [AC_DEFINE(HAVE_SEL_GET_NAME, 1, [Whether we have sel_get_name])]) AC_CHECK_LIB(objc, sel_getName, [AC_DEFINE(HAVE_SEL_GETNAME, 1, [Whether we have sel_getName])]) |
︙ | ︙ |
Modified src/Makefile from [95c2cb6098] to [bfb2e35d1d].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 SRCS = OFConstCString.m \ OFCString.m \ OFConstWideCString.m \ OFExceptions.m \ OFFile.m \ OFList.m \ OFListObject.m \ OFObject.m \ OFString.m \ OFWideCString.m \ OFXMLFactory.m | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 SRCS = OFConstCString.m \ OFCString.m \ OFConstWideCString.m \ OFExceptions.m \ OFHashes.m \ OFFile.m \ OFList.m \ OFListObject.m \ OFObject.m \ OFString.m \ OFWideCString.m \ OFXMLFactory.m |
︙ | ︙ |
Modified src/OFFile.h from [fb39a1e440] to [f9dde14242].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. 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 <stdio.h> #import "OFObject.h" @interface OFFile: OFObject { FILE *fp; } | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. 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 <stdio.h> #import <stdint.h> #import "OFObject.h" @interface OFFile: OFObject { FILE *fp; } |
︙ | ︙ | |||
31 32 33 34 35 36 37 | + (int)symlink: (const char*)src to: (const char*)dest; - initWithPath: (const char*)path andMode: (const char*)mode; - free; - (BOOL)atEndOfFile; | | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | + (int)symlink: (const char*)src to: (const char*)dest; - initWithPath: (const char*)path andMode: (const char*)mode; - free; - (BOOL)atEndOfFile; - (size_t)readIntoBuffer: (uint8_t*)buf withSize: (size_t)size andNItems: (size_t)nItems; - (uint8_t*)readWithSize: (size_t)size andNItems: (size_t)nitems; - (size_t)writeBuffer: (uint8_t*)buf withSize: (size_t)size andNItems: (size_t)nitems; @end |
Modified src/OFFile.m from [4069e4ea59] to [2d25231c0e].
︙ | ︙ | |||
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 | } - initWithPath: (const char*)path andMode: (const char*)mode { if ((self = [super init])) { if ((fp = fopen(path, mode)) == NULL) { [self free]; return nil; } } return self; } - free { fclose(fp); return [super free]; } - (BOOL)atEndOfFile { return (feof(fp) == 0 ? NO : YES); } | > > > | | | | | 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 | } - initWithPath: (const char*)path andMode: (const char*)mode { if ((self = [super init])) { if ((fp = fopen(path, mode)) == NULL) { [[OFOpenFileFailedException newWithObject: self andPath: path andMode: mode] raise]; [self free]; return nil; } } return self; } - free { fclose(fp); return [super free]; } - (BOOL)atEndOfFile { return (feof(fp) == 0 ? NO : YES); } - (size_t)readIntoBuffer: (uint8_t*)buf withSize: (size_t)size andNItems: (size_t)nitems { size_t ret; if ((ret = fread(buf, size, nitems, fp)) == 0 && !feof(fp)) [[OFReadFailedException newWithObject: self andSize: size andNItems: nitems] raise]; return ret; } - (uint8_t*)readWithSize: (size_t)size andNItems: (size_t)nitems { uint64_t memsize; uint8_t *ret; if (size >= 0xFFFFFFFF || nitems >= 0xFFFFFFFF || (memsize = (uint64_t)nitems * size) > 0xFFFFFFFF) { [[OFOverflowException newWithObject: self] raise]; return NULL; } |
︙ | ︙ | |||
123 124 125 126 127 128 129 | @throw e; return NULL; } return ret; } | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | @throw e; return NULL; } return ret; } - (size_t)writeBuffer: (uint8_t*)buf withSize: (size_t)size andNItems: (size_t)nitems { size_t ret; if ((ret = fwrite(buf, size, nitems, fp)) == 0 && size != 0 && nitems != 0) |
︙ | ︙ |
Added src/OFHashes.h version [714154ae18].
> > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. 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 <stdint.h> #import "OFObject.h" @interface OFMD5Hash: OFObject { uint32_t buf[4]; uint32_t bits[2]; uint8_t in[64]; } - init; - (void)updateWithBuffer: (const uint8_t*)buf ofSize: (size_t)size; - (uint8_t*)digest; @end |
Added src/OFHashes.m version [5bb7027c8f].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. 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 "config.h" #import <string.h> #import <stdint.h> #import "OFHashes.h" #ifdef BIG_ENDIAN inline void bswap(uint8_t *buf, size_t len) { uint32_t t; do { t = (uint32_t)((uint32_t)buf[3] << 8 | buf[2]) << 16 | ((uint32_t)buf[1] << 8 | buf[0]); *(uint32_t*)buf = t; buf += 4; } while(--len); } #else #define bswap(buf, len) #endif /* 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) 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 - init { if ((self = [super init])) { buf[0] = 0x67452301; buf[1] = 0xEFCDAB89; buf[2] = 0x98BADCFE; buf[3] = 0x10325476; bits[0] = 0; bits[1] = 0; } return self; } - (void)updateWithBuffer: (const uint8_t*)buffer ofSize: (size_t)size { uint32_t t; /* Update bitcount */ t = bits[0]; if ((bits[0] = t + ((uint32_t)size << 3)) < t) bits[1]++; /* Carry from low to high */ bits[1] += size >> 29; t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */ /* Handle any leading odd-sized chunks */ if (t) { uint8_t *p = (uint8_t*)in + t; t = 64 - t; if (size < t) { memcpy(p, buffer, size); return; } memcpy(p, buffer, t); bswap(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); bswap(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; /* 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); bswap(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); } bswap(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); bswap((uint8_t*)buf, 4); return (uint8_t*)buf; } @end |
Modified tests/Makefile from [3eda77d485] to [a5c3f52b03].
|
| | | 1 2 3 | SUBDIRS = OFObject OFHashes OFString OFList OFWideString OFXMLFactory include ../buildsys.mk |
Added tests/OFHashes/Makefile version [b6141ec416].
> > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | PROG_NOINST = ofhashes SRCS = OFHashes.m include ../../buildsys.mk CPPFLAGS += -I../../src LIBS += -lobjc -L../../src -lobjfw .PHONY: run all: run run: ${PROG_NOINST} rm -f libobjfw.so.1 libobjfw.dylib ln -s ../../src/libobjfw.so libobjfw.so.1 ln -s ../../src/libobjfw.dylib libobjfw.dylib LD_LIBRARY_PATH=. \ DYLD_LIBRARY_PATH=. \ ./${PROG_NOINST} rm -f libobjfw.so.1 libobjfw.dylib |
Added tests/OFHashes/OFHashes.m version [0be48bf5bd].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. 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 <stdio.h> #import <string.h> #import "OFHashes.h" #import "OFFile.h" const uint8_t testfile_md5[16] = "\x00\x8B\x9D\x1B\x58\xDF\xF8\xFE\xEE\xF3\xAE\x8D\xBB\x68\x2D\x38"; int main() { uint8_t buf[64]; size_t len; OFMD5Hash *md5 = [OFMD5Hash new]; OFFile *f = [OFFile newWithPath: "testfile" andMode: "r"]; while (![f atEndOfFile]) { len = [f readIntoBuffer: buf withSize: 1 andNItems: 64]; [md5 updateWithBuffer: buf ofSize: len]; } [f free]; if (!memcmp([md5 digest], testfile_md5, 16)) puts("Correct MD5 sum calculated!"); else { puts("MD5 SUM MISMATCH!!"); return 1; } return 0; } |
Added tests/OFHashes/testfile version [ac78121630].
cannot compute difference between binary files