1 files changed, 136 insertions, 8 deletions

diff --git a/lib/roken/base64.c b/lib/roken/base64.c
index 6ee4899e5331..1391c8280797 100644
--- a/lib/roken/base64.c
+++ b/lib/roken/base64.c
@@ -33,22 +33,43 @@
 
 #include <config.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
+#ifdef TEST
+#include <stdio.h>
+#include <getarg.h>
+#include <err.h>
+#endif
 #include "base64.h"
+#include "roken.h"
 
-static const char base64_chars[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+#define base64_chars "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
 
 static int
 pos(char c)
 {
+#if 'A' == '\301'
     const char *p;
     for (p = base64_chars; *p; p++)
 	if (*p == c)
 	    return p - base64_chars;
     return -1;
+#else
+    if (c >= 'A' && c <= 'Z')
+	return c - 'A';
+    if (c >= 'a' && c <= 'z')
+	return ('Z' + 1 - 'A') + c - 'a';
+    if (c >= '0' && c <= '9')
+	return ('Z' + 1 - 'A') +
+	       ('z' + 1 - 'a') + c - '0';
+    if (c == '+')
+	return 62;
+    if (c == '/')
+	return 63;
+    return -1;
+#endif
 }
 
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
@@ -61,6 +82,7 @@ rk_base64_encode(const void *data, int size, char **str)
 
     if (size > INT_MAX/4 || size < 0) {
 	*str = NULL;
+        errno = ERANGE;
 	return -1;
     }
 
@@ -104,9 +126,7 @@ token_decode(const char *token)
     int i;
     unsigned int val = 0;
     int marker = 0;
-    if (strlen(token) < 4)
-	return DECODE_ERROR;
-    for (i = 0; i < 4; i++) {
+    for (i = 0; i < 4 && token[i] != '\0'; i++) {
 	val *= 64;
 	if (token[i] == '=')
 	    marker++;
@@ -115,7 +135,7 @@ token_decode(const char *token)
 	else
 	    val += pos(token[i]);
     }
-    if (marker > 2)
+    if (i < 4 || marker > 2)
 	return DECODE_ERROR;
     return (marker << 24) | val;
 }
@@ -127,16 +147,124 @@ rk_base64_decode(const char *str, void *data)
     unsigned char *q;
 
     q = data;
-    for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) {
+    for (p = str; *p && (*p == '=' || pos(*p) != -1); p += 4) {
 	unsigned int val = token_decode(p);
 	unsigned int marker = (val >> 24) & 0xff;
-	if (val == DECODE_ERROR)
+	if (val == DECODE_ERROR) {
+            errno = EINVAL;
 	    return -1;
+        }
 	*q++ = (val >> 16) & 0xff;
 	if (marker < 2)
 	    *q++ = (val >> 8) & 0xff;
 	if (marker < 1)
 	    *q++ = val & 0xff;
     }
+    if (q - (unsigned char *) data > INT_MAX) {
+        errno = EOVERFLOW;
+        return -1;
+    }
     return q - (unsigned char *) data;
 }
+
+#ifdef TEST
+static int decode_flag;
+static int help_flag;
+
+/*
+ * The short options are compatible with a subset of the FreeBSD contrib
+ * vis(1).  Heimdal additions have long option names only.
+ */
+static struct getargs args[] = {
+    { "decode", 'd', arg_flag, &decode_flag, "Decode", NULL },
+    { "help", 'h', arg_flag, &help_flag, "Print help message", NULL },
+};
+static size_t num_args = sizeof(args)/sizeof(args[0]);
+
+int
+main(int argc, char **argv)
+{
+    unsigned char *buf = NULL;
+    size_t buflen = 0;
+    size_t bufsz = 0;
+    int goptind = 0;
+    int ret;
+
+    setprogname("rkbase64");
+    if (getarg(args, num_args, argc, argv, &goptind) || help_flag) {
+        arg_printusage(args, num_args, NULL, "FILE | -");
+        return help_flag ? 0 : 1;
+    }
+
+    argc -= goptind;
+    argv += goptind;
+
+    if (help_flag)
+        return arg_printusage(args, num_args, NULL, "FILE | -- -"), 0;
+    if (argc != 1)
+        return arg_printusage(args, num_args, NULL, "FILE | -- -"), 1;
+
+    if (strcmp(argv[0], "-") == 0) {
+        unsigned char *tmp;
+        unsigned char d[4096];
+        size_t bytes;
+
+        while (!feof(stdin) && !ferror(stdin)) {
+            bytes = fread(d, 1, sizeof(d), stdin);
+            if (bytes == 0)
+                continue;
+            if (buflen + bytes > bufsz) {
+                if ((tmp = realloc(buf, bufsz + (bufsz >> 2) + sizeof(d))) == NULL)
+                    err(1, "Could not read stdin");
+                buf = tmp;
+                bufsz = bufsz + (bufsz >> 2) + sizeof(d);
+            }
+            memcpy(buf + buflen, d, bytes);
+            buflen += bytes;
+        }
+        if (ferror(stdin))
+            err(1, "Could not read stdin");
+    } else {
+        void *d;
+        if ((errno = rk_undumpdata(argv[0], &d, &bufsz)))
+            err(1, "Could not read %s", argv[0]);
+        buflen = bufsz;
+        buf = d;
+    }
+
+    if (decode_flag) {
+        unsigned char *d;
+
+        if (buflen == bufsz) {
+            unsigned char *tmp;
+
+            if ((tmp = realloc(buf, bufsz + 1)) == NULL)
+                err(1, "Could not decode data");
+            buf = tmp;
+            bufsz++;
+        }
+        buf[buflen] = '\0';
+
+        if ((d = malloc(buflen * 3 / 4 + 4)) == NULL)
+            err(1, "Could not decode data");
+
+        if ((ret = rk_base64_decode((const char *)buf, d)) < 0)
+            err(1, "Could not decode data");
+        if (fwrite(d, ret, 1, stdout) != 1)
+            err(1, "Could not write decoded data");
+        free(d);
+    } else if (buf) { /* buf can be NULL if we read from an empty file */
+        char *e;
+
+        if ((ret = rk_base64_encode(buf, buflen, &e)) < 0)
+            err(1, "Could not encode data");
+        if (fwrite(e, ret, 1, stdout) != 1)
+            err(1, "Could not write decoded data");
+        free(e);
+        if (fwrite("\n", 1, 1, stdout) != 1)
+            err(1, "Could not write decoded data");
+    }
+    free(buf);
+    return 0;
+}
+#endif