Changeset 812a413 for protocols

Timestamp:

2006-06-23T18:15:28Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df1694b

Parents:

00ab350

Message:

Added saner base64 encoding function (actually, moved the one from libyahoo2.c
to core, with some changes), which I need for the XML format password garbling.

File:

• protocols/yahoo/libyahoo2.c (modified) (1 diff)

protocols/yahoo/libyahoo2.c

@@ -695 +695 @@
 }
 
-static char base64digits[] =    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                "abcdefghijklmnopqrstuvwxyz"
-                                "0123456789._";
+/* 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)
-/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
-{
-        for (; inlen >= 3; inlen -= 3)
-                {
-                        *out++ = base64digits[in[0] >> 2];
-                        *out++ = base64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
-                        *out++ = base64digits[((in[1]<<2) & 0x3c) | (in[2]>>6)];
-                        *out++ = base64digits[in[2] & 0x3f];
-                        in += 3;
-                }
-        if (inlen > 0)
-                {
-                        unsigned char fragment;
-
-                        *out++ = base64digits[in[0] >> 2];
-                        fragment = (in[0] << 4) & 0x30;
-                        if (inlen > 1)
-                                fragment |= in[1] >> 4;
-                        *out++ = base64digits[fragment];
-                        *out++ = (inlen < 2) ? '-' 
-                                        : base64digits[(in[1] << 2) & 0x3c];
-                        *out++ = '-';
-                }
-        *out = '\0';
+{
+        return base64_encode_real(in, inlen, out, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-");
 }