X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/158d096132f284c409fe1954457c67d77caf796c..a202463f02ef9fe101e14bd5ca264de34d50a405:/lib/base64.c

diff --git a/lib/base64.c b/lib/base64.c
index c657cde..7d9d3a9 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -1,39 +1,32 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005, 2007 Richard Kettlewell
+ * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
+ * 
+ * This program 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 General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file lib/base64.c
  * @brief Support for MIME base64
  */
 
-#include <config.h>
-#include "types.h"
-
-#include <string.h>
-
-#include <stdio.h>
+#include "common.h"
 
 #include "mem.h"
 #include "base64.h"
 #include "vector.h"
 
 static const char mime_base64_table[] =
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
 /** @brief Convert MIME base64
  * @param s base64 data
@@ -44,6 +37,20 @@ static const char mime_base64_table[] =
  * 2045 s6.8</a>.
  */
 char *mime_base64(const char *s, size_t *nsp) {
+  return generic_base64(s, nsp, mime_base64_table);
+}
+
+/** @brief Convert base64
+ * @param s base64 data
+ * @param nsp Where to store length of converted data
+ * @param table Table of characters to use
+ * @return Decoded data
+ *
+ * @p table should consist of 65 characters.  The first 64 will be used to
+ * represents the 64 digits and the 65th will be used as padding at the end
+ * (i.e. the role of '=' in RFC2045 base64).
+ */
+char *generic_base64(const char *s, size_t *nsp, const char *table) {
   struct dynstr d;
   const char *t;
   int b[4], n, c;
@@ -51,21 +58,21 @@ char *mime_base64(const char *s, size_t *nsp) {
   dynstr_init(&d);
   n = 0;
   while((c = (unsigned char)*s++)) {
-    if((t = strchr(mime_base64_table, c))) {
-      b[n++] = t - mime_base64_table;
-      if(n == 4) {
-	dynstr_append(&d, (b[0] << 2) + (b[1] >> 4));
-	dynstr_append(&d, (b[1] << 4) + (b[2] >> 2));
-	dynstr_append(&d, (b[2] << 6) + b[3]);
-	n = 0;
-      }
-    } else if(c == '=') {
+    if(c == table[64]) {
       if(n >= 2) {
 	dynstr_append(&d, (b[0] << 2) + (b[1] >> 4));
 	if(n == 3)
 	  dynstr_append(&d, (b[1] << 4) + (b[2] >> 2));
       }
       break;
+    } else if((t = strchr(table, c))) {
+      b[n++] = t - table;
+      if(n == 4) {
+	dynstr_append(&d, (b[0] << 2) + (b[1] >> 4));
+	dynstr_append(&d, (b[1] << 4) + (b[2] >> 2));
+	dynstr_append(&d, (b[2] << 6) + b[3]);
+	n = 0;
+      }
     }
   }
   if(nsp)
@@ -74,7 +81,7 @@ char *mime_base64(const char *s, size_t *nsp) {
   return d.vec;
 }
 
-/** @brief Convert a binary string to base64
+/** @brief Convert a binary string to MIME base64
  * @param s Bytes to convert
  * @param ns Number of bytes to convert
  * @return Encoded data
@@ -85,34 +92,50 @@ char *mime_base64(const char *s, size_t *nsp) {
  * 2045 s6.8</a>.
  */
 char *mime_to_base64(const uint8_t *s, size_t ns) {
+  return generic_to_base64(s, ns, mime_base64_table);
+}
+
+/** @brief Convert a binary string to base64
+ * @param s Bytes to convert
+ * @param ns Number of bytes to convert
+ * @param table Table of characters to use
+ * @return Encoded data
+ *
+ * This function does not attempt to split up lines.
+ *
+ * @p table should consist of 65 characters.  The first 64 will be used to
+ * represents the 64 digits and the 65th will be used as padding at the end
+ * (i.e. the role of '=' in RFC2045 base64).
+ */
+char *generic_to_base64(const uint8_t *s, size_t ns, const char *table) {
   struct dynstr d[1];
 
   dynstr_init(d);
   while(ns >= 3) {
     /* Input bytes with output bits: AAAAAABB BBBBCCCC CCDDDDDD */
     /* Output bytes with input bits: 000000 001111 111122 222222 */
-    dynstr_append(d, mime_base64_table[s[0] >> 2]);
-    dynstr_append(d, mime_base64_table[((s[0] & 3) << 4)
+    dynstr_append(d, table[s[0] >> 2]);
+    dynstr_append(d, table[((s[0] & 3) << 4)
 				       + (s[1] >> 4)]);
-    dynstr_append(d, mime_base64_table[((s[1] & 15) << 2)
+    dynstr_append(d, table[((s[1] & 15) << 2)
 				       + (s[2] >> 6)]);
-    dynstr_append(d, mime_base64_table[s[2] & 63]);
+    dynstr_append(d, table[s[2] & 63]);
     ns -= 3;
     s += 3;
   }
   if(ns > 0) {
-    dynstr_append(d, mime_base64_table[s[0] >> 2]);
+    dynstr_append(d, table[s[0] >> 2]);
     switch(ns) {
     case 1:
-      dynstr_append(d, mime_base64_table[(s[0] & 3) << 4]);
-      dynstr_append(d, '=');
-      dynstr_append(d, '=');
+      dynstr_append(d, table[(s[0] & 3) << 4]);
+      dynstr_append(d, table[64]);
+      dynstr_append(d, table[64]);
       break;
     case 2:
-      dynstr_append(d, mime_base64_table[((s[0] & 3) << 4)
+      dynstr_append(d, table[((s[0] & 3) << 4)
 					 + (s[1] >> 4)]);
-      dynstr_append(d, mime_base64_table[(s[1] & 15) << 2]);
-      dynstr_append(d, '=');
+      dynstr_append(d, table[(s[1] & 15) << 2]);
+      dynstr_append(d, table[64]);
       break;
     }
   }