@@ -15,58 +15,71 @@
  */
 
 #include "config.h"
 
 #import "OFString.h"
+#import "OFDataArray.h"
 #import "base64.h"
 
-const char of_base64_table[64] = {
+const char of_base64_encode_table[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 signed char of_base64_decode_table[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,
+	20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 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, -1, -1, -1, -1, -1
+};
 
 OFString*
 of_base64_encode(const char *buf, size_t len)
 {
 	OFMutableString *ret = [OFMutableString string];
-	size_t i, rest;
+	size_t i;
+	uint8_t rest;
 	char tb[4];
 	uint32_t sb;
 
 	rest = len % 3;
 
 	for (i = 0; i < len - rest; i += 3) {
 		sb = (buf[i] << 16) | (buf[i + 1] << 8) | buf[i + 2];
 
-		tb[0] = of_base64_table[(sb & 0xFC0000) >> 18];
-		tb[1] = of_base64_table[(sb & 0x03F000) >> 12];
-		tb[2] = of_base64_table[(sb & 0x000FC0) >> 6];
-		tb[3] = of_base64_table[(sb & 0x00003F)];
+		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];
 
 		[ret appendCStringWithoutUTF8Checking: tb
 					       length: 4];
 	}
 
 	switch (rest) {
-	case 1:;
-		tb[0] = of_base64_table[buf[i] >> 2];
-		tb[1] = of_base64_table[(buf[i] & 3) << 4];
+	case 1:
+		tb[0] = of_base64_encode_table[buf[i] >> 2];
+		tb[1] = of_base64_encode_table[(buf[i] & 3) << 4];
 		tb[2] = tb[3] = '=';
 
 		[ret appendCStringWithoutUTF8Checking: tb
 					       length: 4];
 
 		break;
-	case 2:;
+	case 2:
 		sb = (buf[i] << 16) | (buf[i + 1] << 8);
 
-		tb[0] = of_base64_table[(sb & 0xFC0000) >> 18];
-		tb[1] = of_base64_table[(sb & 0x03F000) >> 12];
-		tb[2] = of_base64_table[(sb & 0x000FC0) >> 6];
+		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] = '=';
 
 		[ret appendCStringWithoutUTF8Checking: tb
 					       length: 4];
 
@@ -73,5 +86,64 @@
 		break;
 	}
 
 	return ret;
 }
+
+BOOL
+of_base64_decode(OFDataArray *data, const char *str, size_t len)
+{
+	uint8_t *buf = (uint8_t*)str;
+	size_t i;
+
+	if ((len & 3) != 0)
+		return NO;
+
+	for (i = 0; i < len; i += 4) {
+		uint32_t sb = 0;
+		uint8_t cnt = 3;
+		char db[3];
+		char tmp;
+
+		if (buf[i] > 0x7F || buf[i + 1] > 0x7F ||
+		    buf[i + 2] > 0x7F || buf[i + 3] > 0x7F)
+			return NO;
+
+		if (buf[i] == '=' || buf[i + 1] == '=' ||
+		    (buf[i + 2] == '=' && buf[i + 3] != '='))
+			return NO;
+
+		if (buf[i + 2] == '=')
+			cnt--;
+		if (buf[i + 3] == '=')
+			cnt--;
+
+		if ((tmp = of_base64_decode_table[buf[i]]) == -1)
+			return NO;
+
+		sb |= tmp << 18;
+
+		if ((tmp = of_base64_decode_table[buf[i + 1]]) == -1)
+			return NO;
+
+		sb |= tmp << 12;
+
+		if ((tmp = of_base64_decode_table[buf[i + 2]]) == -1)
+			return NO;
+
+		sb |= tmp << 6;
+
+		if ((tmp = of_base64_decode_table[buf[i + 3]]) == -1)
+			return NO;
+
+		sb |= tmp;
+
+		db[0] = (sb & 0xFF0000) >> 16;
+		db[1] = (sb & 0x00FF00) >> 8;
+		db[2] = sb & 0x0000FF;
+
+		[data addNItems: cnt
+		     fromCArray: db];
+	}
+
+	return YES;
+}