1 files changed, 48 insertions, 53 deletions

diff --git a/src/base64.c b/src/base64.c
index e558d9e..603ab6d 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -28,7 +28,7 @@ static const signed char base64_table[256] = {
 	-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, -1, -1, -1,
+	52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -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,
@@ -43,82 +43,77 @@ static const signed char base64_table[256] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
-char *base64encode(const unsigned char *buf, size_t *size)
+size_t base64encode(char *outbuf, const unsigned char *buf, size_t size)
 {
-	if (!buf || !size || !(*size > 0)) return NULL;
-	int outlen = (*size / 3) * 4;
-	char *outbuf = (char*)malloc(outlen+5); // 4 spare bytes + 1 for '\0'
+	if (!outbuf || !buf || (size <= 0)) {
+		return 0;
+	}
+
 	size_t n = 0;
 	size_t m = 0;
 	unsigned char input[3];
 	unsigned int output[4];
-	while (n < *size) {
+	while (n < size) {
 		input[0] = buf[n];
-		input[1] = (n+1 < *size) ? buf[n+1] : 0;
-		input[2] = (n+2 < *size) ? buf[n+2] : 0;
+		input[1] = (n+1 < size) ? buf[n+1] : 0;
+		input[2] = (n+2 < size) ? buf[n+2] : 0;
 		output[0] = input[0] >> 2;
 		output[1] = ((input[0] & 3) << 4) + (input[1] >> 4);
 		output[2] = ((input[1] & 15) << 2) + (input[2] >> 6);
 		output[3] = input[2] & 63;
 		outbuf[m++] = base64_str[(int)output[0]];
 		outbuf[m++] = base64_str[(int)output[1]];
-		outbuf[m++] = (n+1 < *size) ? base64_str[(int)output[2]] : base64_pad;
-		outbuf[m++] = (n+2 < *size) ? base64_str[(int)output[3]] : base64_pad;
+		outbuf[m++] = (n+1 < size) ? base64_str[(int)output[2]] : base64_pad;
+		outbuf[m++] = (n+2 < size) ? base64_str[(int)output[3]] : base64_pad;
 		n+=3;
 	}
 	outbuf[m] = 0; // 0-termination!
-	*size = m;
-	return outbuf;
-}
-
-static int base64decode_block(unsigned char *target, const char *data, size_t data_size)
-{
-	int w1,w2,w3,w4;
-	int n,i;
-
-	if (!data || (data_size <= 0)) {
-		return 0;
-	}
-
-	n = 0;
-	i = 0;
-	while (n < data_size-3) {
-		w1 = base64_table[(int)data[n]];
-		w2 = base64_table[(int)data[n+1]];
-		w3 = base64_table[(int)data[n+2]];
-		w4 = base64_table[(int)data[n+3]];
-
-		if (w2 >= 0) {
-			target[i++] = (char)((w1*4 + (w2 >> 4)) & 255);
-		}
-		if (w3 >= 0) {
-			target[i++] = (char)((w2*16 + (w3 >> 2)) & 255);
-		}
-		if (w4 >= 0) {
-			target[i++] = (char)((w3*64 + w4) & 255);
-		}
-		n+=4;
-	}
-	return i;
+	return m;
 }
 
 unsigned char *base64decode(const char *buf, size_t *size)
 {
-	if (!buf) return NULL;
-	size_t len = strlen(buf);
+	if (!buf || !size) return NULL;
+	size_t len = (*size > 0) ? *size : strlen(buf);
 	if (len <= 0) return NULL;
 	unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3);
+	if (!outbuf) return NULL;
+	const char *ptr = buf;
+	size_t p = 0;
+	int wv, w1, w2, w3, w4;
+	int tmpval[4];
+	int tmpcnt = 0;
 
-	unsigned char *line;
-	int p = 0;
+	do {
+		while (ptr < buf+len && (*ptr == ' ' || *ptr == '\t' || *ptr == '\n' || *ptr == '\r')) {
+			ptr++;
+		}
+		if (*ptr == '\0' || ptr >= buf+len) {
+			break;
+		}
+		if ((wv = base64_table[(int)(unsigned char)*ptr++]) == -1) {
+			continue;
+		}
+		tmpval[tmpcnt++] = wv;
+		if (tmpcnt == 4) {
+			tmpcnt = 0;
+			w1 = tmpval[0];
+			w2 = tmpval[1];
+			w3 = tmpval[2];
+			w4 = tmpval[3];
 
-	line = (unsigned char*)strtok((char*)buf, "\r\n\t ");
-	while (line) {
-		p+=base64decode_block(outbuf+p, (const char*)line, strlen((char*)line));
+			if (w1 >= 0 && w2 >= 0) {
+				outbuf[p++] = (unsigned char)(((w1 << 2) + (w2 >> 4)) & 0xFF);
+			}
+			if (w2 >= 0 && w3 >= 0) {
+				outbuf[p++] = (unsigned char)(((w2 << 4) + (w3 >> 2)) & 0xFF);
+			}
+			if (w3 >= 0 && w4 >= 0) {
+				outbuf[p++] = (unsigned char)(((w3 << 6) + w4) & 0xFF);
+			}
+		}
+	} while (1);
 
-		// get next line of base64 encoded block
-		line = (unsigned char*)strtok(NULL, "\r\n\t ");
-	}
 	outbuf[p] = 0;
 	*size = p;
 	return outbuf;