X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=594c91a5f76dd0c7726ba83893d43d41443e854a;hb=75e5b2e906bd8563bf0f53a76065618c88122e1c;hp=edaa354fdf905a08e9902be3cfd2cea9fe096aeb;hpb=5e00a24e1f13fa70a6945831c409d873b7809d11;p=tinc

diff --git a/src/utils.c b/src/utils.c
index edaa354f..594c91a5 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -52,14 +52,16 @@ static int charhex2bin(char c) {
 		return toupper(c) - 'A' + 10;
 }
 
-int hex2bin(const char *src, char *dst, int length) {
+int hex2bin(const char *src, void *vdst, int length) {
+	char *dst = vdst;
 	int 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(const char *src, char *dst, int length) {
+int bin2hex(const void *vsrc, char *dst, int length) {
+	const char *src = vsrc;
 	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];
@@ -68,7 +70,7 @@ int bin2hex(const char *src, char *dst, int length) {
 	return length * 2;
 }
 
-int b64decode(const char *src, char *dst, int length) {
+int b64decode(const char *src, void *dst, int length) {
 	int i;
 	uint32_t triplet = 0;
 	unsigned char *udst = (unsigned char *)dst;
@@ -99,7 +101,7 @@ int b64decode(const char *src, char *dst, int length) {
 	}
 }
 
-static int b64encode_internal(const char *src, char *dst, int length, const char *alphabet) {
+static int b64encode_internal(const void *src, char *dst, int length, const char *alphabet) {
 	uint32_t triplet;
 	const unsigned char *usrc = (unsigned char *)src;
 	int si = length / 3 * 3;
@@ -112,14 +114,14 @@ static int b64encode_internal(const char *src, char *dst, int length, const char
 			dst[di + 1] = alphabet[triplet & 63]; triplet >>= 6;
 			dst[di + 2] = alphabet[triplet];
 			dst[di + 3] = 0;
-			length = di + 2;
+			length = di + 3;
 			break;
 		case 1:
 			triplet = usrc[si];
 			dst[di] = alphabet[triplet & 63]; triplet >>= 6;
 			dst[di + 1] = alphabet[triplet];
 			dst[di + 2] = 0;
-			length = di + 1;
+			length = di + 2;
 			break;
 		default:
 			dst[di] = 0;
@@ -140,11 +142,11 @@ static int b64encode_internal(const char *src, char *dst, int length, const char
 	return length;
 }
 
-int b64encode(const char *src, char *dst, int length) {
+int b64encode(const void *src, char *dst, int length) {
 	return b64encode_internal(src, dst, length, base64_original);
 }
 
-int b64encode_urlsafe(const char *src, char *dst, int length) {
+int b64encode_urlsafe(const void *src, char *dst, int length) {
 	return b64encode_internal(src, dst, length, base64_urlsafe);
 }