ObjFW  Diff

Differences From Artifact [19f8d7a88b]:

To Artifact [903e063a45]:


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
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







+








-
+


-
-
-
+
+
+
+






-
+





-
-
+
+




-
+

-
+


-
+

-
-
-
-
-
-
+
-
-
-
-
+
-
-

-
-
-
+
-
-
-
-
+
-
-
+
-
-
-


 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

#include "config.h"

#import "OFString.h"
#import "OFHash.h"
#import "OFMD5Hash.h"
#import "OFSHA1Hash.h"

#import "autorelease.h"

int _OFString_Hashing_reference;

@implementation OFString (Hashing)
- (OFString*)MD5Hash
- (OFString*)OF_hashAsStringWithHash: (Class <OFHash>)hashClass
{
	void *pool = objc_autoreleasePoolPush();
	OFMD5Hash *hash = [OFMD5Hash hash];
	uint8_t *digest;
	char ret[OF_MD5_DIGEST_SIZE * 2];
	id <OFHash> hash = [hashClass hash];
	size_t digestSize = [hashClass digestSize];
	const uint8_t *digest;
	char cString[digestSize * 2];
	size_t i;

	[hash updateWithBuffer: [self UTF8String]
			length: [self UTF8StringLength]];
	digest = [hash digest];

	for (i = 0; i < OF_MD5_DIGEST_SIZE; i++) {
	for (i = 0; i < digestSize; i++) {
		uint8_t high, low;

		high = digest[i] >> 4;
		low  = digest[i] & 0x0F;

		ret[i * 2] = (high > 9 ? high - 10 + 'a' : high + '0');
		ret[i * 2 + 1] = (low > 9 ? low - 10 + 'a' : low + '0');
		cString[i * 2] = (high > 9 ? high - 10 + 'a' : high + '0');
		cString[i * 2 + 1] = (low > 9 ? low - 10 + 'a' : low + '0');
	}

	objc_autoreleasePoolPop(pool);

	return [OFString stringWithCString: ret
	return [OFString stringWithCString: cString
				  encoding: OF_STRING_ENCODING_ASCII
				    length: 32];
				    length: digestSize * 2];
}

- (OFString*)SHA1Hash
- (OFString*)MD5Hash
{
	void *pool = objc_autoreleasePoolPush();
	OFSHA1Hash *hash = [OFSHA1Hash hash];
	uint8_t *digest;
	char ret[OF_SHA1_DIGEST_SIZE * 2];
	size_t i;

	return [self OF_hashAsStringWithHash: [OFMD5Hash class]];
	[hash updateWithBuffer: [self UTF8String]
			length: [self UTF8StringLength]];
	digest = [hash digest];

}
	for (i = 0; i < OF_SHA1_DIGEST_SIZE; i++) {
		uint8_t high, low;

		high = digest[i] >> 4;
		low  = digest[i] & 0x0F;

- (OFString*)SHA1Hash
		ret[i * 2] = (high > 9 ? high - 10 + 'a' : high + '0');
		ret[i * 2 + 1] = (low > 9 ? low - 10 + 'a' : low + '0');
	}

{
	objc_autoreleasePoolPop(pool);

	return [self OF_hashAsStringWithHash: [OFSHA1Hash class]];
	return [OFString stringWithCString: ret
				  encoding: OF_STRING_ENCODING_ASCII
				    length: 40];
}
@end