Moved Base64-related functions to a separate file and added decode funtions.

9 files changed, 191 insertions, 50 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 80cdd9a5..6408c5ba 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,7 +9,7 @@
 -include ../Makefile.settings
 
 # [SH] Program variables
-objects = $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o rc4.o sha.o $(SSL_CLIENT) url.o
+objects = base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o rc4.o sha.o $(SSL_CLIENT) url.o
 
 CFLAGS += -Wall
 LFLAGS += -r
diff --git a/lib/base64.c b/lib/base64.c
new file mode 100644
index 00000000..69069dae
--- /dev/null
+++ b/lib/base64.c
@@ -0,0 +1,153 @@
+/***************************************************************************\
+*                                                                           *
+*  BitlBee - An IRC to IM gateway                                           *
+*  Base64 handling functions. encode_real() is mostly based on the y64 en-  *
+*  coder from libyahoo2. Moving it to a new file because it's getting big.  *
+*                                                                           *
+*  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
+*                                                                           *
+*  This program is free software; you can redistribute it and/or modify     *
+*  it under the terms of the GNU General Public License as published by     *
+*  the Free Software Foundation; either version 2 of the License, or        *
+*  (at your option) any later version.                                      *
+*                                                                           *
+*  This program is distributed in the hope that it will be useful,          *
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
+*  GNU General Public License for more details.                             *
+*                                                                           *
+*  You should have received a copy of the GNU General Public License along  *
+*  with this program; if not, write to the Free Software Foundation, Inc.,  *
+*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.              *
+*                                                                           *
+\***************************************************************************/
+
+#include <glib.h>
+#include <string.h>
+#include "base64.h"
+
+static const char real_b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+char *tobase64(const char *text)
+{
+	return base64_encode(text, strlen(text));
+}
+
+char *base64_encode(const char *in, int len)
+{
+	char *out;
+	
+	out = g_malloc((len + 2)    /* the == padding */
+	                    / 3     /* every 3-byte block */
+	                    * 4     /* becomes a 4-byte one */
+	                    + 1);   /* and of course, ASCIIZ! */
+	
+	base64_encode_real((unsigned char*) in, len, (unsigned char*) out, real_b64);
+	
+	return out;
+}
+
+int base64_encode_real(const unsigned char *in, int inlen, unsigned char *out, const char *b64digits)
+{
+	int outlen = 0;
+	
+	for (; inlen >= 3; inlen -= 3)
+	{
+		out[outlen++] = b64digits[in[0] >> 2];
+		out[outlen++] = b64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
+		out[outlen++] = b64digits[((in[1]<<2) & 0x3c) | (in[2]>>6)];
+		out[outlen++] = b64digits[in[2] & 0x3f];
+		in += 3;
+	}
+	if (inlen > 0)
+	{
+		out[outlen++] = b64digits[in[0] >> 2];
+		if (inlen > 1)
+		{
+			out[outlen++] = b64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
+			out[outlen++] = b64digits[((in[1]<<2) & 0x3c)];
+		}
+		else
+		{
+			out[outlen++] = b64digits[((in[0]<<4) & 0x30)];
+			out[outlen++] = b64digits[64];
+		}
+		out[outlen++] = b64digits[64];
+	}
+	out[outlen] = 0;
+	
+	return outlen;
+}
+
+/* Just a simple wrapper, but usually not very convenient because of zero
+   termination. */
+char *frombase64(const char *in)
+{
+	unsigned char *out;
+	
+	base64_decode(in, &out);
+	
+	return (char*) out;
+}
+
+/* FIXME: Lookup table stuff is not threadsafe! (But for now BitlBee is not threaded.) */
+int base64_decode(const char *in, unsigned char **out)
+{
+	static char b64rev[256] = { 0 };
+	int len, i;
+	
+	/* Create a reverse-lookup for the Base64 sequence. */
+	if( b64rev[0] == 0 )
+	{
+		memset( b64rev, 0xff, 256 );
+		for( i = 0; i <= 64; i ++ )
+			b64rev[(int)real_b64[i]] = i;
+	}
+	
+	len = strlen( in );
+	*out = g_malloc( ( len + 6 ) / 4 * 3 );
+	len = base64_decode_real( (unsigned char*) in, *out, b64rev );
+	*out = g_realloc( *out, len + 1 );
+	out[0][len] = 0;	/* Zero termination can't hurt. */
+	
+	return len;
+}
+
+int base64_decode_real(const unsigned char *in, unsigned char *out, char *b64rev)
+{
+	int i, outlen = 0;
+	
+	for( i = 0; in[i]; i += 4 )
+	{
+		int sx;
+		
+		sx = b64rev[(int)in[i+0]];
+		if( sx >= 64 )
+			break;
+		out[outlen] = ( sx << 2 ) & 0xfc;
+		
+		sx = b64rev[(int)in[i+1]];
+		if( sx >= 64 )
+			break;
+		out[outlen] |= ( sx >> 4 ) & 0x03;
+		outlen ++;
+		out[outlen] = ( sx << 4 ) & 0xf0;
+		
+		sx = b64rev[(int)in[i+2]];
+		if( sx >= 64 )
+			break;
+		out[outlen] |= ( sx >> 2 ) & 0x0f;
+		outlen ++;
+		out[outlen] = ( sx << 6 ) & 0xc0;
+		
+		sx = b64rev[(int)in[i+3]];
+		if( sx >= 64 )
+			break;
+		out[outlen] |= sx;
+		outlen ++;
+	}
+	
+	/* If sx > 64 the base64 string was damaged. Should we ignore this? */
+	
+	return outlen;
+}
diff --git a/lib/base64.h b/lib/base64.h
new file mode 100644
index 00000000..570f2b14
--- /dev/null
+++ b/lib/base64.h
@@ -0,0 +1,33 @@
+/***************************************************************************\
+*                                                                           *
+*  BitlBee - An IRC to IM gateway                                           *
+*  Base64 handling functions. encode_real() is mostly based on the y64 en-  *
+*  coder from libyahoo2. Moving it to a new file because it's getting big.  *
+*                                                                           *
+*  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
+*                                                                           *
+*  This program is free software; you can redistribute it and/or modify     *
+*  it under the terms of the GNU General Public License as published by     *
+*  the Free Software Foundation; either version 2 of the License, or        *
+*  (at your option) any later version.                                      *
+*                                                                           *
+*  This program is distributed in the hope that it will be useful,          *
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
+*  GNU General Public License for more details.                             *
+*                                                                           *
+*  You should have received a copy of the GNU General Public License along  *
+*  with this program; if not, write to the Free Software Foundation, Inc.,  *
+*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.              *
+*                                                                           *
+\***************************************************************************/
+
+#include <glib.h>
+#include <gmodule.h>
+
+G_MODULE_EXPORT char *tobase64( const char *text );
+G_MODULE_EXPORT char *base64_encode( const char *in, int len );
+G_MODULE_EXPORT int base64_encode_real( const unsigned char *in, int inlen, unsigned char *out, const char *b64digits );
+G_MODULE_EXPORT char *frombase64( const char *in );
+G_MODULE_EXPORT int base64_decode( const char *in, unsigned char **out );
+G_MODULE_EXPORT int base64_decode_real( const unsigned char *in, unsigned char *out, char *b64reverse );
diff --git a/lib/misc.c b/lib/misc.c
index d8d6a4c7..9f592289 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -83,50 +83,6 @@ char *add_cr(char *text)
 	return ret;
 }
 
-char *tobase64(const char *text)
-{
-	char *out;
-	int len;
-	
-	len = strlen(text);
-	out = g_malloc((len + 2)    /* the == padding */
-	                    / 3     /* every 3-byte block */
-	                    * 4     /* becomes a 4-byte one */
-	                    + 1);   /* and of course, ASCIIZ! */
-	
-	base64_encode_real(text, len, out, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=");
-	
-	return out;
-}
-
-void base64_encode_real(const unsigned char *in, int inlen, unsigned char *out, char *b64digits)
-{
-	for (; inlen >= 3; inlen -= 3)
-	{
-		*out++ = b64digits[in[0] >> 2];
-		*out++ = b64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
-		*out++ = b64digits[((in[1]<<2) & 0x3c) | (in[2]>>6)];
-		*out++ = b64digits[in[2] & 0x3f];
-		in += 3;
-	}
-	if (inlen > 0)
-	{
-		*out++ = b64digits[in[0] >> 2];
-		if (inlen > 1)
-		{
-			*out++ = b64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
-			*out++ = b64digits[((in[1]<<2) & 0x3c)];
-		}
-		else
-		{
-			*out++ = b64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
-			*out++ = b64digits[64];
-		}
-		*out++ = b64digits[64];
-	}
-	*out = '\0';
-}
-
 char *normalize(const char *s)
 {
 	static char buf[BUF_LEN];
diff --git a/lib/misc.h b/lib/misc.h
index c7eec19b..ed019bd8 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -29,8 +29,6 @@
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
 G_MODULE_EXPORT char *strip_newlines(char *source);
-G_MODULE_EXPORT char *tobase64( const char *text );
-G_MODULE_EXPORT void base64_encode_real( const unsigned char *in, int inlen, unsigned char *out, char *b64digits );
 G_MODULE_EXPORT char *normalize( const char *s );
 G_MODULE_EXPORT void info_string_append( GString *str, char *newline, char *name, char *value );
 
diff --git a/lib/proxy.c b/lib/proxy.c
index b8aa304d..453cde91 100644
--- a/lib/proxy.c
+++ b/lib/proxy.c
@@ -40,6 +40,7 @@
 #include <errno.h>
 #include "nogaim.h"
 #include "proxy.h"
+#include "base64.h"
 
 char proxyhost[128] = "";
 int proxyport = 0;
diff --git a/lib/rc4.c b/lib/rc4.c
index 3559f71e..2b732ba2 100644
--- a/lib/rc4.c
+++ b/lib/rc4.c
@@ -5,7 +5,6 @@
 *                                                                           *
 *  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
 *                                                                           *
-*                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
 *  it under the terms of the GNU General Public License as published by     *
 *  the Free Software Foundation; either version 2 of the License, or        *
diff --git a/lib/rc4.h b/lib/rc4.h
index 8d50b508..6c9ea6b9 100644
--- a/lib/rc4.h
+++ b/lib/rc4.h
@@ -5,7 +5,6 @@
 *                                                                           *
 *  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
 *                                                                           *
-*                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
 *  it under the terms of the GNU General Public License as published by     *
 *  the Free Software Foundation; either version 2 of the License, or        *
diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c
index ee0f2f0e..69b63baa 100644
--- a/protocols/yahoo/libyahoo2.c
+++ b/protocols/yahoo/libyahoo2.c
@@ -89,6 +89,8 @@ char *strchr (), *strrchr ();
 #define vsnprintf _vsnprintf
 #endif
 
+#include "base64.h"
+
 #ifdef USE_STRUCT_CALLBACKS
 struct yahoo_callbacks *yc=NULL;
 
@@ -697,7 +699,7 @@ static void yahoo_packet_dump(unsigned char *data, int len)
 /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
 static void to_y64(unsigned char *out, const unsigned char *in, int inlen)
 {
-	return base64_encode_real(in, inlen, out, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-");
+	base64_encode_real(in, inlen, out, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-");
 }
 
 static void yahoo_add_to_send_queue(struct yahoo_input_data *yid, void *data, int length)