@@ -30,12 +30,12 @@
 	OFMD5Hash *hash = [OFMD5Hash MD5Hash];
 	uint8_t *digest;
 	char ret[OF_MD5_DIGEST_SIZE * 2];
 	size_t i;
 
-	[hash updateWithBuffer: [self cString]
-			length: [self cStringLength]];
+	[hash updateWithBuffer: [self UTF8String]
+			length: [self UTF8StringLength]];
 	digest = [hash digest];
 
 	for (i = 0; i < OF_MD5_DIGEST_SIZE; i++) {
 		uint8_t high, low;
 
@@ -47,10 +47,11 @@
 	}
 
 	[pool release];
 
 	return [OFString stringWithCString: ret
+				  encoding: OF_STRING_ENCODING_ASCII
 				    length: 32];
 }
 
 - (OFString*)SHA1Hash
 {
@@ -58,12 +59,12 @@
 	OFMD5Hash *hash = [OFSHA1Hash SHA1Hash];
 	uint8_t *digest;
 	char ret[OF_SHA1_DIGEST_SIZE * 2];
 	size_t i;
 
-	[hash updateWithBuffer: [self cString]
-			length: [self cStringLength]];
+	[hash updateWithBuffer: [self UTF8String]
+			length: [self UTF8StringLength]];
 	digest = [hash digest];
 
 	for (i = 0; i < OF_SHA1_DIGEST_SIZE; i++) {
 		uint8_t high, low;
 
@@ -75,8 +76,9 @@
 	}
 
 	[pool release];
 
 	return [OFString stringWithCString: ret
+				  encoding: OF_STRING_ENCODING_ASCII
 				    length: 40];
 }
 @end