Base64 Patch

base64.patch

diff --git a/Makefile.in b/Makefile.in
index 76a351f..48c58a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,13 +29,15 @@ CFLAGS = -O
 YFLAGS = -d
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 
-CSRCS = ast.c code_gen.c db_file.c db_io.c db_objects.c db_properties.c \
-	db_verbs.c decompile.c disassemble.c eval_env.c eval_vm.c \
-	exceptions.c execute.c extensions.c functions.c keywords.c list.c \
-	log.c malloc.c match.c md5.c name_lookup.c network.c net_mplex.c \
-	net_proto.c numbers.c objects.c parse_cmd.c pattern.c program.c \
-	property.c quota.c ref_count.c regexpr.c server.c storage.c streams.c str_intern.c \
-	sym_table.c tasks.c timers.c unparse.c utils.c verbs.c version.c
+CSRCS = ast.c base64.c code_gen.c db_file.c db_io.c db_objects.c \
+	db_properties.c db_verbs.c decompile.c disassemble.c \
+	eval_env.c eval_vm.c exceptions.c execute.c extensions.c \
+	functions.c keywords.c list.c log.c malloc.c match.c md5.c \
+	name_lookup.c network.c net_mplex.c net_proto.c numbers.c \
+	objects.c parse_cmd.c pattern.c program.c property.c quota.c \
+	ref_count.c regexpr.c server.c storage.c streams.c \
+	str_intern.c sym_table.c tasks.c timers.c unparse.c utils.c \
+	verbs.c version.c
 
 OPT_NET_SRCS = net_single.c net_multi.c \
 	net_mp_selct.c net_mp_poll.c net_mp_fake.c \
@@ -47,14 +49,15 @@ OPT_CSRCS = gnu-malloc.c $(OPT_NET_SRCS)
 
 YSRCS = parser.y
 
-HDRS =  ast.h bf_register.h code_gen.h db.h db_io.h db_private.h decompile.h \
-	disassemble.h eval_env.h eval_vm.h exceptions.h execute.h functions.h \
-	getpagesize.h keywords.h list.h log.h match.h md5.h name_lookup.h \
-	network.h net_mplex.h net_multi.h net_proto.h numbers.h opcode.h \
-	options.h parse_cmd.h parser.h pattern.h program.h quota.h random.h \
-	ref_count.h regexpr.h server.h storage.h streams.h structures.h  str_intern.h \
-	sym_table.h tasks.h timers.h tokens.h unparse.h utils.h verbs.h \
-	version.h
+HDRS = ast.h base64.h bf_register.h code_gen.h db.h db_io.h \
+	db_private.h decompile.h disassemble.h eval_env.h eval_vm.h \
+	exceptions.h execute.h functions.h getpagesize.h keywords.h \
+	list.h log.h match.h md5.h name_lookup.h network.h \
+	net_mplex.h net_multi.h net_proto.h numbers.h opcode.h \
+	options.h parse_cmd.h parser.h pattern.h program.h quota.h \
+	random.h ref_count.h regexpr.h server.h storage.h streams.h \
+	structures.h str_intern.h sym_table.h tasks.h timers.h \
+	tokens.h unparse.h utils.h verbs.h version.h
 
 SYSHDRS = my-ctype.h my-fcntl.h my-in.h my-inet.h my-ioctl.h my-math.h \
 	my-poll.h my-signal.h my-socket.h my-stat.h my-stdarg.h my-stdio.h \
diff --git a/base64.c b/base64.c
new file mode 100644
index 0000000..ff8ca88
--- /dev/null
+++ b/base64.c
@@ -0,0 +1,228 @@
+/*
+ * Base64 encoding/decoding (RFC1341)
+ * Copyright (c) 2005, Jouni Malinen <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+/******************************************************************************
+  Copyright 2010 Todd Sundsted. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY TODD SUNDSTED ``AS IS'' AND ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+  EVENT SHALL TODD SUNDSTED OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+  OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  The views and conclusions contained in the software and documentation are
+  those of the authors and should not be interpreted as representing official
+  policies, either expressed or implied, of Todd Sundsted.
+ *****************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "base64.h"
+#include "functions.h"
+#include "storage.h"
+#include "streams.h"
+#include "utils.h"
+#include "server.h"
+
+static const unsigned char base64_table[64] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/**
+ * base64_encode - Base64 encode
+ * @src: Data to be encoded
+ * @len: Length of the data to be encoded
+ * @out_len: Pointer to output length variable; %NULL if not used
+ * Returns: Allocated buffer of out_len bytes of encoded data,
+ * or %NULL on failure
+ *
+ * Caller is responsible for freeing the returned buffer. Returned
+ * buffer is null terminated to make it easier to use as a C
+ * string. The null terminator is not included in out_len.
+ */
+unsigned char *
+base64_encode(const unsigned char *src, size_t len, size_t *out_len)
+{
+    unsigned char *out, *pos;
+    const unsigned char *end, *in;
+    size_t olen;
+
+    olen = len * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
+    olen++; /* nul termination */
+    out = mymalloc(olen, M_STRING);
+    if (out == NULL)
+	return NULL;
+
+    end = src + len;
+    in = src;
+    pos = out;
+    while (end - in >= 3) {
+	*pos++ = base64_table[in[0] >> 2];
+	*pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
+	*pos++ = base64_table[((in[1] & 0x0f) << 2) | (in[2] >> 6)];
+	*pos++ = base64_table[in[2] & 0x3f];
+	in += 3;
+    }
+
+    if (end - in) {
+	*pos++ = base64_table[in[0] >> 2];
+	if (end - in == 1) {
+	    *pos++ = base64_table[(in[0] & 0x03) << 4];
+	    *pos++ = '=';
+	} else {
+	    *pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
+	    *pos++ = base64_table[(in[1] & 0x0f) << 2];
+	}
+	*pos++ = '=';
+    }
+
+    *pos = '\0';
+    if (out_len)
+	*out_len = pos - out;
+    return out;
+}
+
+/**
+ * base64_decode - Base64 decode
+ * @src: Data to be decoded
+ * @len: Length of the data to be decoded
+ * @out_len: Pointer to output length variable
+ * Returns: Allocated buffer of out_len bytes of decoded data,
+ * or %NULL on failure
+ *
+ * Caller is responsible for freeing the returned buffer.
+ */
+unsigned char *
+base64_decode(const unsigned char *src, size_t len, size_t *out_len)
+{
+    unsigned char dtable[256], *out, *pos, in[4], block[4], tmp;
+    size_t i, count, olen;
+
+    memset(dtable, 0x80, 256);
+    for (i = 0; i < sizeof(base64_table); i++)
+	dtable[base64_table[i]] = i;
+    dtable['='] = 0;
+
+    count = 0;
+    for (i = 0; i < len; i++) {
+	if (dtable[src[i]] != 0x80)
+	    count++;
+    }
+
+    if (count % 4)
+	return NULL;
+
+    olen = count / 4 * 3;
+    pos = out = mymalloc(olen + 1, M_STRING);
+    if (out == NULL)
+	return NULL;
+
+    count = 0;
+    for (i = 0; i < len; i++) {
+	tmp = dtable[src[i]];
+	if (tmp == 0x80)
+	    continue;
+
+	in[count] = src[i];
+	block[count] = tmp;
+	count++;
+	if (count == 4) {
+	    *pos++ = (block[0] << 2) | (block[1] >> 4);
+	    *pos++ = (block[1] << 4) | (block[2] >> 2);
+	    *pos++ = (block[2] << 6) | block[3];
+	    count = 0;
+	}
+    }
+
+    if (pos > out) {
+	if (in[2] == '=')
+	    pos -= 2;
+	else if (in[3] == '=')
+	    pos--;
+    }
+
+    *out_len = pos - out;
+    return out;
+}
+
+/**** built in functions ****/
+
+static package
+bf_encode_base64(Var arglist, Byte next, void *vdata, Objid progr)
+{
+    int len;
+    size_t length;
+    const char *in = binary_to_raw_bytes(arglist.v.list[1].v.str, &len);
+    if (NULL == in) {
+	free_var(arglist);
+	return make_error_pack(E_INVARG);
+    }
+    char *out = base64_encode(in, (size_t)len, &length);
+    if (NULL == out) { /* only happens if the encoder can't malloc */
+	free_var(arglist);
+	return make_error_pack(E_INVARG);
+    }
+
+    Var ret;
+    ret.type = TYPE_STR;
+    ret.v.str = str_dup(raw_bytes_to_binary(out, (int)length));
+    free_str(out);
+    free_var(arglist);
+    return make_var_pack(ret);
+}
+
+static package
+bf_decode_base64(Var arglist, Byte next, void *vdata, Objid progr)
+{
+    int len;
+    size_t length;
+    const char *in = binary_to_raw_bytes(arglist.v.list[1].v.str, &len);
+    if (NULL == in) {
+	free_var(arglist);
+	return make_error_pack(E_INVARG);
+    }
+    char *out = base64_decode(in, (size_t)len, &length);
+    if (NULL == out) { /* there are problems with the input string or the decoder can't malloc */
+	free_var(arglist);
+	return make_error_pack(E_INVARG);
+    }
+
+    Var ret;
+    ret.type = TYPE_STR;
+    ret.v.str = str_dup(raw_bytes_to_binary(out, (int)length));
+    free_str(out);
+    free_var(arglist);
+    return make_var_pack(ret);
+}
+
+void
+register_base64(void)
+{
+    register_function("encode_base64", 1, 1, bf_encode_base64, TYPE_STR);
+    register_function("decode_base64", 1, 1, bf_decode_base64, TYPE_STR);
+}
diff --git a/base64.h b/base64.h
new file mode 100644
index 0000000..5dd2905
--- /dev/null
+++ b/base64.h
@@ -0,0 +1,51 @@
+/*
+ * Base64 encoding/decoding (RFC1341)
+ * Copyright (c) 2005, Jouni Malinen <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+/******************************************************************************
+  Copyright 2010 Todd Sundsted. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY TODD SUNDSTED ``AS IS'' AND ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+  EVENT SHALL TODD SUNDSTED OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+  OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  The views and conclusions contained in the software and documentation are
+  those of the authors and should not be interpreted as representing official
+  policies, either expressed or implied, of Todd Sundsted.
+ *****************************************************************************/
+
+#ifndef BASE64_H
+#define BASE64_H
+
+unsigned char * base64_encode(const unsigned char *src, size_t len,
+			      size_t *out_len);
+unsigned char * base64_decode(const unsigned char *src, size_t len,
+			      size_t *out_len);
+
+#endif /* BASE64_H */
diff --git a/bf_register.h b/bf_register.h
index 1adb10b..2dd15c4 100644
--- a/bf_register.h
+++ b/bf_register.h
@@ -27,6 +27,7 @@ extern void register_property(void);
 extern void register_server(void);
 extern void register_tasks(void);
 extern void register_verbs(void);
+extern void register_base64(void);
 
 /* 
  * $Log: bf_register.h,v $
diff --git a/functions.c b/functions.c
index 5c786f9..09422f7 100644
--- a/functions.c
+++ b/functions.c
@@ -54,7 +54,8 @@ static registry bi_function_registries[] =
     register_property,
     register_server,
     register_tasks,
-    register_verbs
+    register_verbs,
+    register_base64
 };
 
 void