added new base32-implementation, work has to be done to incoorp this into encoding

src/Makefile

@@ -1,8 +1,8 @@
 CC = gcc
 CLIENT = ../bin/iodine
-CLIENTOBJS = iodine.o tun.o dns.o read.o encoding.o login.o
+CLIENTOBJS = iodine.o tun.o dns.o read.o encoding.o login.o base32.o
 SERVER = ../bin/iodined
-SERVEROBJS = iodined.o tun.o dns.o read.o encoding.o login.o
+SERVEROBJS = iodined.o tun.o dns.o read.o encoding.o login.o base32.o
 
 OS = `uname | tr "a-z" "A-Z"`
 

src/base32.c

@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2006 Bjorn Andersson <flex@kryo.se>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "base32.h"
+
+static const char cb32[] = 
+	"abcdefghijklmnopqrstuvwxyz0123456789";
+
+/*
+6 2
+4 4
+2 6
+
+3 -> 4
+*/
+
+/*
+q[0]: 5 3
+q[1]: 2 5 1
+q[2]: 4 4
+q[3]: 1 5 2
+q[4]: 3 5
+
+5 -> 8
+*/
+
+int 
+base32_encode(char **buf, size_t *buflen, const void *data, size_t size)
+{
+	size_t newsize;
+	char *newbuf;
+	char *s;
+	char *p;
+	char *q;
+	int i;
+
+	newsize = size * 8 / 5 + 5;
+	if (newsize > *buflen) {
+		if ((newbuf = realloc(*buf, newsize)) == NULL) {
+			free(*buf);
+			*buf = NULL;
+			*buflen = 0;
+			return 0;
+		}
+
+		*buf = newbuf;
+		*buflen = newsize;
+	}
+
+	p = s = *buf;
+	q = (char*)data;
+
+	for(i=0;i<size;i+=5) {
+		p[0] = cb32[(q[0] >> 3)];
+		p[1] = cb32[((q[0] & 0x07) << 2) | ((q[1] & 0xc0) >> 6)];
+		p[2] = (i+1 < size) ? cb32[((q[1] & 0x3e) >> 1)] : '\0';
+		p[3] = (i+1 < size) ? cb32[((q[1] & 0x01) << 4) | ((q[2] & 0xf0) >> 4)] : '\0';
+		p[4] = (i+2 < size) ? cb32[((q[2] & 0x0f) << 1) | ((q[3] & 0x80) >> 7)] : '\0';
+		p[5] = (i+3 < size) ? cb32[((q[3] & 0x3e) >> 2)] : '\0';
+		p[6] = (i+3 < size) ? cb32[((q[3] & 0x03) << 3) | ((q[4] & 0xe0) > 5)] : '\0';
+		p[7] = (i+4 < size) ? cb32[((q[4] & 0x1f))] : '\0';
+		
+		q += 5;
+		p += 8;
+	}	
+	*p = 0;
+	return strlen(s);
+}
+
+#define DECODE_ERROR 0xffffffff
+
+static int
+pos(char c)
+{
+    const char *p;
+    for (p = cb32; *p; p++)
+		if (*p == c)
+			return p - cb32;
+    return -1;
+}
+/*
+
+q[0]: 5 3
+q[1]: 2 5 1
+q[2]: 4 4
+q[3]: 1 5 2
+q[4]: 3 5
+*/
+
+static int
+decode_token(const char *t, char *data) 
+{
+	int len;
+
+	len = strlen(t);
+
+	data[0] = (len > 1) ? ((pos(t[0]) & 0x1f) << 3) | 
+						  ((pos(t[1]) & 0x1c) >> 2) : '\0';
+	data[1] = (len > 2) ? ((pos(t[1]) & 0x03) << 6) | 
+						  ((pos(t[2]) & 0x1f) << 1) | 
+						  ((pos(t[3]) & 0x10) >> 4) : '\0';
+	data[2] = (len > 3) ? ((pos(t[3]) & 0x0f) << 4) |
+						  ((pos(t[4]) & 0x1e) >> 1) : '\0';
+	data[3] = (len > 4) ? ((pos(t[4]) & 0x01) << 7) |
+						  ((pos(t[5]) & 0x1f) << 2) |
+						  ((pos(t[6]) & 0x18) >> 3) : '\0';
+	data[4] = (len > 5) ? ((pos(t[6]) & 0x07) << 5) |
+						  ((pos(t[7]) & 0x1f)) : '\0';
+
+	return (len > 5) ? 5 : len;
+}
+
+int
+base32_decode(void **buf, size_t *buflen, const char *str)
+{
+	unsigned char *q;
+	size_t newsize;
+	const char *p;
+	char *newbuf;
+	int len;
+
+	newsize = strlen(str) * 5 / 8;
+	if (newsize > *buflen) {
+		if ((newbuf = realloc(*buf, newsize)) == NULL) {
+			free(*buf);
+			*buf = NULL;
+			*buflen = 0;
+			return 0;
+		}
+
+		*buf = newbuf;
+		*buflen = newsize;
+	}
+
+	q = *buf;
+	for (p = str; *p && strchr(cb32, *p); p += 8) {
+		len = decode_token(p, q);	
+		q += len;
+	}
+	*q = '\0';
+	
+	return q - (unsigned char *) *buf;
+}
+

src/base32.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2006 Bjorn Andersson <flex@kryo.se>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __BASE32_H__
+#define __BASE32_H__
+
+int base32_encode(char **, size_t *, const void *, size_t);
+int base32_decode(void **, size_t *, const char *);
+
+#endif