X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=773ad18b07f24020419828df5a5bfad88c37a61d;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=ab426ab7e7b3715d83beca1b1ee2bbeed991ccf1;hpb=06b8271ed5d56c9bd3de459d95907d0ef4f0ea3c;p=tinc

diff --git a/src/utils.c b/src/utils.c
index ab426ab7..773ad18b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -38,7 +38,7 @@ static int charb64decode(char c) {
 		return c - 'a' + 26;
 	else if(c >= 'A')
 		return c - 'A';
-	else if(c >= '0') 
+	else if(c >= '0')
 		return c - '0' + 52;
 	else if(c == '+')
 		return 62;
@@ -46,16 +46,15 @@ static int charb64decode(char c) {
 		return 63;
 }
 
-int hex2bin(char *src, char *dst, int length) {
+int hex2bin(const char *src, char *dst, int length) {
 	int i;
-	for(i = 0; i < length && src[i * 2] && src[i * 2 + 1]; 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;
 }
 
-int bin2hex(char *src, char *dst, int length) {
-	int i;
-	for(i = length - 1; i >= 0; i--) {
+int bin2hex(const char *src, char *dst, int length) {
+	for(int 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];
 	}
@@ -63,10 +62,10 @@ int bin2hex(char *src, char *dst, int length) {
 	return length * 2;
 }
 
-int b64decode(char *src, char *dst, int length) {
+int b64decode(const char *src, char *dst, int length) {
 	int i;
 	uint32_t triplet = 0;
-	unsigned char *udst = dst;
+	unsigned char *udst = (unsigned char *)dst;
 
 	for(i = 0; i < length / 3 * 4 && src[i]; i++) {
 		triplet |= charb64decode(src[i]) << (6 * (i & 3));
@@ -90,14 +89,14 @@ int b64decode(char *src, char *dst, int length) {
 	}
 }
 
-int b64encode(char *src, char *dst, int length) {
+int b64encode(const char *src, char *dst, int length) {
 	uint32_t triplet;
-	const unsigned char *usrc = src;
+	const unsigned char *usrc = (unsigned char *)src;
 	int si = length / 3 * 3;
 	int di = length / 3 * 4;
 
 	switch(length % 3) {
-		case 2:	
+		case 2:
 			triplet = usrc[si] | usrc[si + 1] << 8;
 			dst[di] = base64imals[triplet & 63]; triplet >>= 6;
 			dst[di + 1] = base64imals[triplet & 63]; triplet >>= 6;
@@ -137,15 +136,17 @@ int b64encode(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;
 }