summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojciech Polak <polak@gnu.org>2009-08-08 00:21:31 +0200
committerWojciech Polak <polak@gnu.org>2009-08-08 00:21:31 +0200
commit134c0cc6398077a17ff692475fbd6aebfd4e6509 (patch)
treedb0c113fd6b429a3271a1dbc1cc09eb84d3fba8e
parenta1b914b0c326dd4d5bb4d4fde83ca694e820bc40 (diff)
downloadmailutils-134c0cc6398077a17ff692475fbd6aebfd4e6509.tar.gz
mailutils-134c0cc6398077a17ff692475fbd6aebfd4e6509.tar.bz2
Move base64 routines to libmailutils.
* mailbox/base64.c: New file. * imap4d/auth_gss.c: Use mu_base64_encode() and mu_base64_decode(). * imap4d/util.c (util_base64_encode, util_base64_decode): Remove.
-rw-r--r--imap4d/auth_gss.c12
-rw-r--r--imap4d/imap4d.h10
-rw-r--r--imap4d/util.c80
-rw-r--r--include/mailutils/mime.h8
-rw-r--r--mailbox/Makefile.am1
-rw-r--r--mailbox/base64.c106
6 files changed, 121 insertions, 96 deletions
diff --git a/imap4d/auth_gss.c b/imap4d/auth_gss.c
index 57bf73441..5fd54c41a 100644
--- a/imap4d/auth_gss.c
+++ b/imap4d/auth_gss.c
@@ -171,7 +171,7 @@ auth_gssapi (struct imap4d_command *command,
for (;;)
{
imap4d_getline (&token_str, &token_size, &token_len);
- util_base64_decode (token_str, token_len, &tmp, &size);
+ mu_base64_decode (token_str, token_len, &tmp, &size);
tokbuf.value = tmp;
tokbuf.length = size;
@@ -189,7 +189,7 @@ auth_gssapi (struct imap4d_command *command,
{
if (outbuf.length)
{
- util_base64_encode (outbuf.value, outbuf.length, &tmp, &size);
+ mu_base64_encode (outbuf.value, outbuf.length, &tmp, &size);
util_send ("+ %*.*s\r\n", size, size, tmp);
free (tmp);
gss_release_buffer (&min_stat, &outbuf);
@@ -209,7 +209,7 @@ auth_gssapi (struct imap4d_command *command,
if (outbuf.length)
{
- util_base64_encode (outbuf.value, outbuf.length, &tmp, &size);
+ mu_base64_encode (outbuf.value, outbuf.length, &tmp, &size);
util_send ("+ %*.*s\r\n", size, size, tmp);
free (tmp);
gss_release_buffer (&min_stat, &outbuf);
@@ -229,13 +229,13 @@ auth_gssapi (struct imap4d_command *command,
return RESP_NO;
}
- util_base64_encode (outbuf.value, outbuf.length, &tmp, &size);
+ mu_base64_encode (outbuf.value, outbuf.length, &tmp, &size);
util_send ("+ %*.*s\r\n", size, size, tmp);
free (tmp);
imap4d_getline (&token_str, &token_size, &token_len);
- util_base64_decode (token_str, token_len,
- (unsigned char **) &tokbuf.value, &tokbuf.length);
+ mu_base64_decode (token_str, token_len,
+ (unsigned char **) &tokbuf.value, &tokbuf.length);
free (token_str);
maj_stat = gss_unwrap (&min_stat, context, &tokbuf, &outbuf, &cflags,
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index f78b5f73d..4abc281bf 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -87,6 +87,7 @@
#include <mailutils/list.h>
#include <mailutils/mailbox.h>
#include <mailutils/message.h>
+#include <mailutils/mime.h>
#include <mailutils/mutil.h>
#include <mailutils/mu_auth.h>
#include <mailutils/nls.h>
@@ -347,15 +348,6 @@ extern int util_parse_internal_date (char *date, time_t *timep);
extern int util_parse_822_date (const char *date, time_t *timep);
extern int util_parse_ctime_date (const char *date, time_t *timep);
extern char *util_strcasestr (const char *haystack, const char *needle);
-
-extern int util_base64_encode (const unsigned char *input,
- size_t input_len,
- unsigned char **output,
- size_t *output_len);
-extern int util_base64_decode (const unsigned char *input,
- size_t input_len,
- unsigned char **output,
- size_t *output_len);
extern char *util_localname (void);
extern int util_wcard_match (const char *string, const char *pattern,
diff --git a/imap4d/util.c b/imap4d/util.c
index 4da948a46..a5bc30983 100644
--- a/imap4d/util.c
+++ b/imap4d/util.c
@@ -673,86 +673,6 @@ util_attribute_matches_flag (mu_attribute_t attr, const char *item)
return flags & mask;
}
-int
-util_base64_encode (const unsigned char *input, size_t input_len,
- unsigned char **output, size_t * output_len)
-{
- static char b64tab[] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- size_t olen = 4 * (input_len + 2) / 3;
- unsigned char *out = malloc (olen);
-
- if (!out)
- return 1;
- *output = out;
- while (input_len >= 3)
- {
- *out++ = b64tab[input[0] >> 2];
- *out++ = b64tab[((input[0] << 4) & 0x30) | (input[1] >> 4)];
- *out++ = b64tab[((input[1] << 2) & 0x3c) | (input[2] >> 6)];
- *out++ = b64tab[input[2] & 0x3f];
- olen -= 4;
- input_len -= 3;
- input += 3;
- }
-
- if (input_len > 0)
- {
- unsigned char c = (input[0] << 4) & 0x30;
- *out++ = b64tab[input[0] >> 2];
- if (input_len > 1)
- c |= input[1] >> 4;
- *out++ = b64tab[c];
- *out++ = (input_len < 2) ? '=' : b64tab[(input[1] << 2) & 0x3c];
- *out++ = '=';
- }
- *output_len = out - *output;
- return 0;
-}
-
-int
-util_base64_decode (const unsigned char *input, size_t input_len,
- unsigned char **output, size_t * output_len)
-{
- static int b64val[128] = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
- -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
- };
- int olen = input_len;
- unsigned char *out = malloc (olen);
-
- if (!out)
- return 1;
- *output = out;
- do
- {
- if (input[0] > 127 || b64val[input[0]] == -1
- || input[1] > 127 || b64val[input[1]] == -1
- || input[2] > 127 || ((input[2] != '=') && (b64val[input[2]] == -1))
- || input[3] > 127 || ((input[3] != '=')
- && (b64val[input[3]] == -1)))
- return -1;
- *out++ = (b64val[input[0]] << 2) | (b64val[input[1]] >> 4);
- if (input[2] != '=')
- {
- *out++ = ((b64val[input[1]] << 4) & 0xf0) | (b64val[input[2]] >> 2);
- if (input[3] != '=')
- *out++ = ((b64val[input[2]] << 6) & 0xc0) | b64val[input[3]];
- }
- input += 4;
- input_len -= 4;
- }
- while (input_len > 0);
- *output_len = out - *output;
- return 0;
-}
-
char *
util_localname ()
{
diff --git a/include/mailutils/mime.h b/include/mailutils/mime.h
index bdd0b8314..3bf87067b 100644
--- a/include/mailutils/mime.h
+++ b/include/mailutils/mime.h
@@ -46,7 +46,13 @@ int mu_rfc2047_decode (const char *tocode, const char *fromstr,
int mu_rfc2047_encode (const char *charset, const char *encoding,
const char *text, char **result);
-
+
+int mu_base64_encode (const unsigned char *input, size_t input_len,
+ unsigned char **output, size_t * output_len);
+
+int mu_base64_decode (const unsigned char *input, size_t input_len,
+ unsigned char **output, size_t * output_len);
+
#ifdef __cplusplus
}
#endif
diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am
index 4f5e119dd..461c9467f 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -55,6 +55,7 @@ libmailutils_la_SOURCES = \
attachment.c\
attribute.c\
auth.c\
+ base64.c\
body.c\
cstrcasecmp.c\
cfg_driver.c\
diff --git a/mailbox/base64.c b/mailbox/base64.c
new file mode 100644
index 000000000..0b6f9de75
--- /dev/null
+++ b/mailbox/base64.c
@@ -0,0 +1,106 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+ Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <mailutils/errno.h>
+
+int
+mu_base64_encode (const unsigned char *input, size_t input_len,
+ unsigned char **output, size_t * output_len)
+{
+ static char b64tab[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ size_t olen = 4 * (input_len + 2) / 3;
+ unsigned char *out = malloc (olen);
+
+ if (!out)
+ return ENOMEM;
+ *output = out;
+ while (input_len >= 3)
+ {
+ *out++ = b64tab[input[0] >> 2];
+ *out++ = b64tab[((input[0] << 4) & 0x30) | (input[1] >> 4)];
+ *out++ = b64tab[((input[1] << 2) & 0x3c) | (input[2] >> 6)];
+ *out++ = b64tab[input[2] & 0x3f];
+ olen -= 4;
+ input_len -= 3;
+ input += 3;
+ }
+
+ if (input_len > 0)
+ {
+ unsigned char c = (input[0] << 4) & 0x30;
+ *out++ = b64tab[input[0] >> 2];
+ if (input_len > 1)
+ c |= input[1] >> 4;
+ *out++ = b64tab[c];
+ *out++ = (input_len < 2) ? '=' : b64tab[(input[1] << 2) & 0x3c];
+ *out++ = '=';
+ }
+ *output_len = out - *output;
+ return 0;
+}
+
+int
+mu_base64_decode (const unsigned char *input, size_t input_len,
+ unsigned char **output, size_t * output_len)
+{
+ static int b64val[128] = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+ -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
+ };
+ int olen = input_len;
+ unsigned char *out = malloc (olen);
+
+ if (!out)
+ return ENOMEM;
+ *output = out;
+ do
+ {
+ if (input[0] > 127 || b64val[input[0]] == -1
+ || input[1] > 127 || b64val[input[1]] == -1
+ || input[2] > 127 || ((input[2] != '=') && (b64val[input[2]] == -1))
+ || input[3] > 127 || ((input[3] != '=')
+ && (b64val[input[3]] == -1)))
+ return -1;
+ *out++ = (b64val[input[0]] << 2) | (b64val[input[1]] >> 4);
+ if (input[2] != '=')
+ {
+ *out++ = ((b64val[input[1]] << 4) & 0xf0) | (b64val[input[2]] >> 2);
+ if (input[3] != '=')
+ *out++ = ((b64val[input[2]] << 6) & 0xc0) | b64val[input[3]];
+ }
+ input += 4;
+ input_len -= 4;
+ }
+ while (input_len > 0);
+ *output_len = out - *output;
+ return 0;
+}
+

Return to:

Send suggestions and report system problems to the System administrator.