@@ -13,23 +13,23 @@
  * file.
  */
 
 #include "config.h"
 
+#import "OFBase64.h"
 #import "OFString.h"
 #import "OFData.h"
-#import "base64.h"
 
-const uint8_t of_base64_encode_table[64] = {
+static const unsigned char encodeTable[64] = {
 	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
 	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b',
 	'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
 	'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3',
 	'4', '5', '6', '7', '8', '9', '+', '/'
 };
 
-const int8_t of_base64_decode_table[128] = {
+static const signed char decodeTable[128] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54,
 	55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1, -1,  0,  1,  2,
 	 3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
@@ -37,11 +37,11 @@
 	31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
 	48, 49, 50, 51, -1, -1, -1, -1, -1
 };
 
 OFString *
-of_base64_encode(const void *data, size_t length)
+OFBase64Encode(const void *data, size_t length)
 {
 	OFMutableString *ret = [OFMutableString string];
 	uint8_t *buffer = (uint8_t *)data;
 	size_t i;
 	uint8_t rest;
@@ -51,24 +51,24 @@
 	rest = length % 3;
 
 	for (i = 0; i < length - rest; i += 3) {
 		sb = (buffer[i] << 16) | (buffer[i + 1] << 8) | buffer[i + 2];
 
-		tb[0] = of_base64_encode_table[(sb & 0xFC0000) >> 18];
-		tb[1] = of_base64_encode_table[(sb & 0x03F000) >> 12];
-		tb[2] = of_base64_encode_table[(sb & 0x000FC0) >> 6];
-		tb[3] = of_base64_encode_table[sb & 0x00003F];
+		tb[0] = encodeTable[(sb & 0xFC0000) >> 18];
+		tb[1] = encodeTable[(sb & 0x03F000) >> 12];
+		tb[2] = encodeTable[(sb & 0x000FC0) >> 6];
+		tb[3] = encodeTable[sb & 0x00003F];
 
 		[ret appendCString: tb
 			  encoding: OFStringEncodingASCII
 			    length: 4];
 	}
 
 	switch (rest) {
 	case 1:
-		tb[0] = of_base64_encode_table[buffer[i] >> 2];
-		tb[1] = of_base64_encode_table[(buffer[i] & 3) << 4];
+		tb[0] = encodeTable[buffer[i] >> 2];
+		tb[1] = encodeTable[(buffer[i] & 3) << 4];
 		tb[2] = tb[3] = '=';
 
 		[ret appendCString: tb
 			  encoding: OFStringEncodingASCII
 			    length: 4];
@@ -75,13 +75,13 @@
 
 		break;
 	case 2:
 		sb = (buffer[i] << 16) | (buffer[i + 1] << 8);
 
-		tb[0] = of_base64_encode_table[(sb & 0xFC0000) >> 18];
-		tb[1] = of_base64_encode_table[(sb & 0x03F000) >> 12];
-		tb[2] = of_base64_encode_table[(sb & 0x000FC0) >> 6];
+		tb[0] = encodeTable[(sb & 0xFC0000) >> 18];
+		tb[1] = encodeTable[(sb & 0x03F000) >> 12];
+		tb[2] = encodeTable[(sb & 0x000FC0) >> 6];
 		tb[3] = '=';
 
 		[ret appendCString: tb
 			  encoding: OFStringEncodingASCII
 			    length: 4];
@@ -93,11 +93,11 @@
 
 	return ret;
 }
 
 bool
-of_base64_decode(OFMutableData *data, const char *string, size_t length)
+OFBase64Decode(OFMutableData *data, const char *string, size_t length)
 {
 	const uint8_t *buffer = (const uint8_t *)string;
 	size_t i;
 
 	if ((length & 3) != 0)
@@ -123,26 +123,26 @@
 		if (buffer[i + 2] == '=')
 			count--;
 		if (buffer[i + 3] == '=')
 			count--;
 
-		if ((tmp = of_base64_decode_table[buffer[i]]) == -1)
+		if ((tmp = decodeTable[buffer[i]]) == -1)
 			return false;
 
 		sb |= tmp << 18;
 
-		if ((tmp = of_base64_decode_table[buffer[i + 1]]) == -1)
+		if ((tmp = decodeTable[buffer[i + 1]]) == -1)
 			return false;
 
 		sb |= tmp << 12;
 
-		if ((tmp = of_base64_decode_table[buffer[i + 2]]) == -1)
+		if ((tmp = decodeTable[buffer[i + 2]]) == -1)
 			return false;
 
 		sb |= tmp << 6;
 
-		if ((tmp = of_base64_decode_table[buffer[i + 3]]) == -1)
+		if ((tmp = decodeTable[buffer[i + 3]]) == -1)
 			return false;
 
 		sb |= tmp;
 
 		db[0] = (sb & 0xFF0000) >> 16;