X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=129622b24b83e86eb80d417f8445d64964152467;hb=6dfdb323612184529b4b83c1be914dda8262de47;hp=6b44556afcacb5b7082b56c666e8a85247df077e;hpb=1d92dd62a786ecabbc05dfba5195f3f08e0f9585;p=tinc

diff --git a/src/utils.c b/src/utils.c
index 6b44556a..129622b2 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -34,35 +34,43 @@ static int charhex2bin(char c) {
 }
 
 static int charb64decode(char c) {
-	if(c > 'a')
+	if(c >= 'a')
 		return c - 'a' + 26;
-	else if(c > 'A')
+	else if(c >= 'A')
 		return c - 'A';
+	else if(c >= '0') 
+		return c - '0' + 52;
+	else if(c == '+')
+		return 62;
 	else
-		return c - '0';
+		return 63;
 }
 
-void hex2bin(char *src, char *dst, int length) {
+int hex2bin(const char *src, char *dst, int length) {
 	int i;
-	for(i = 0; i < length; i++)
+	for(i = 0; i < length && isxdigit(src[i * 2]) && isxdigit(src[i * 2 + 1]); i++)
 		dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]);
+	return i;
 }
 
-void bin2hex(char *src, char *dst, int length) {
+int bin2hex(const char *src, char *dst, int length) {
 	int i;
 	for(i = length - 1; i >= 0; i--) {
 		dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15];
 		dst[i * 2] = hexadecimals[(unsigned char) src[i] >> 4];
 	}
+	dst[length * 2] = 0;
+	return length * 2;
 }
 
 int b64decode(const char *src, char *dst, int length) {
+	int i;
 	uint32_t triplet = 0;
-	unsigned char *udst;
+	unsigned char *udst = (unsigned char *)dst;
 
-	for(int i = 0; i < length; i++) {
-		triplet |= charb64decode(src[i]) << (6 * (i % 4));
-		if((i % 4) == 3) {
+	for(i = 0; i < length / 3 * 4 && src[i]; i++) {
+		triplet |= charb64decode(src[i]) << (6 * (i & 3));
+		if((i & 3) == 3) {
 			udst[0] = triplet & 0xff; triplet >>= 8;
 			udst[1] = triplet & 0xff; triplet >>= 8;
 			udst[2] = triplet;
@@ -70,49 +78,57 @@ int b64decode(const char *src, char *dst, int length) {
 			udst += 3;
 		}
 	}
-	if((length % 4) == 3) {
+	if((i & 3) == 3) {
 		udst[0] = triplet & 0xff; triplet >>= 8;
 		udst[1] = triplet & 0xff;
-		return length / 4 * 3 + 2;
-	} else if((length % 4) == 2) {
+		return i / 4 * 3 + 2;
+	} else if((i & 3) == 2) {
 		udst[0] = triplet & 0xff;
-		return length / 4 * 3 + 1;
+		return i / 4 * 3 + 1;
 	} else {
-		return length / 4 * 3;
+		return i / 4 * 3;
 	}
 }
 
 int b64encode(const char *src, char *dst, int length) {
 	uint32_t triplet;
-	const unsigned char *usrc = src;
-	int origlen = length;
-
-	while(length > 0) {
-		if(length >= 3) {
-			triplet = usrc[0] | usrc[1] << 8 | usrc[2] << 16;
-			dst[0] = base64imals[triplet & 63]; triplet >>= 6;
-			dst[1] = base64imals[triplet & 63]; triplet >>= 6;
-			dst[2] = base64imals[triplet & 63]; triplet >>= 6;
-			dst[3] = base64imals[triplet];
-			dst += 4; usrc += 3; length -= 3;
-		} else if(length >=2) {
-			triplet = usrc[0] | usrc[1] << 8;
-			dst[0] = base64imals[triplet & 63]; triplet >>= 6;
-			dst[1] = base64imals[triplet & 63]; triplet >>= 6;
-			dst[2] = base64imals[triplet];
-			dst[3] = 0;
-			return origlen / 3 * 4 + 3;
-		} else {
-			triplet = usrc[0];
-			dst[0] = base64imals[triplet & 63]; triplet >>= 6;
-			dst[1] = base64imals[triplet];
-			dst[2] = 0;
-			return origlen / 3 * 4 + 2;
-		}
+	const unsigned char *usrc = (unsigned char *)src;
+	int si = length / 3 * 3;
+	int di = length / 3 * 4;
+
+	switch(length % 3) {
+		case 2:	
+			triplet = usrc[si] | usrc[si + 1] << 8;
+			dst[di] = base64imals[triplet & 63]; triplet >>= 6;
+			dst[di + 1] = base64imals[triplet & 63]; triplet >>= 6;
+			dst[di + 2] = base64imals[triplet];
+			dst[di + 3] = 0;
+			length = di + 2;
+			break;
+		case 1:
+			triplet = usrc[si];
+			dst[di] = base64imals[triplet & 63]; triplet >>= 6;
+			dst[di + 1] = base64imals[triplet];
+			dst[di + 2] = 0;
+			length = di + 1;
+			break;
+		default:
+			dst[di] = 0;
+			length = di;
+			break;
 	}
 
-	*dst = 0;
-	return origlen / 4 * 3;
+	while(si > 0) {
+		di -= 4;
+		si -= 3;
+		triplet = usrc[si] | usrc[si + 1] << 8 | usrc[si + 2] << 16;
+		dst[di] = base64imals[triplet & 63]; triplet >>= 6;
+		dst[di + 1] = base64imals[triplet & 63]; triplet >>= 6;
+		dst[di + 2] = base64imals[triplet & 63]; triplet >>= 6;
+		dst[di + 3] = base64imals[triplet];
+	}
+
+	return length;
 }
 
 #if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
@@ -121,15 +137,17 @@ int b64encode(const char *src, char *dst, int length) {
 #endif
 
 const char *winerror(int err) {
-	static char buf[1024], *newline;
+	static char buf[1024], *ptr;
+
+	ptr = buf + sprintf(buf, "(%d) ", err);
 
 	if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-	        NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, sizeof(buf), NULL)) {
+	        NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ptr, sizeof(buf) - (ptr - buf), NULL)) {
 		strncpy(buf, "(unable to format errormessage)", sizeof(buf));
 	};
 
-	if((newline = strchr(buf, '\r')))
-		*newline = '\0';
+	if((ptr = strchr(buf, '\r')))
+		*ptr = '\0';
 
 	return buf;
 }