Changeset 7ed3199

Timestamp:

2006-06-25T14:07:01Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6e1fed7

Parents:

df1694b

Message:

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

Files:

• lib/Makefile (modified) (1 diff)
• lib/base64.c (added)
• lib/base64.h (added)
• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• lib/proxy.c (modified) (1 diff)
• lib/rc4.c (modified) (1 diff)
• lib/rc4.h (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (2 diffs)

lib/Makefile

@@ -10 +10 @@
 
 # [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

lib/misc.c

@@ -82 +82 @@
 
         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';
 }
 

lib/misc.h

@@ -30 +30 @@
 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 );

lib/proxy.c

@@ -41 +41 @@
 #include "nogaim.h"
 #include "proxy.h"
+#include "base64.h"
 
 char proxyhost[128] = "";

lib/rc4.c

@@ -5 +5 @@
 *                                                                           *
 *  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
-*                                                                           *
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *

lib/rc4.h

@@ -5 +5 @@
 *                                                                           *
 *  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
-*                                                                           *
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *

protocols/yahoo/libyahoo2.c

@@ -89 +89 @@
 #define vsnprintf _vsnprintf
 #endif
+
+#include "base64.h"
 
 #ifdef USE_STRUCT_CALLBACKS
@@ -698 +700 @@
 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._-");
 }