Local base64 decoder

diff --git a/src/http.c b/src/http.c
index 9de8ab79851b28899e4c721c90d92b3d1ab1b8a3..e0287d274c32ab3d6fc434a85455b910e73b4e93 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -29,8 +29,6 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include <libavutil/base64.h>
-
 #include "tvhead.h"
 #include "tcp.h"
 #include "http.h"
@@ -471,7 +469,7 @@ process_request(http_connection_t *hc, htsbuf_queue_t *spill)
   /* Extract authorization */
   if((v = http_arg_get(&hc->hc_args, "Authorization")) != NULL) {
     if((n = http_tokenize(v, argv, 2, -1)) == 2) {
-      n = av_base64_decode(authbuf, argv[1], sizeof(authbuf) - 1);
+      n = base64_decode(authbuf, argv[1], sizeof(authbuf) - 1);
       authbuf[n] = 0;
       if((n = http_tokenize((char *)authbuf, argv, 2, ':')) == 2) {
        hc->hc_username = strdup(argv[0]);

diff --git a/src/tvhead.h b/src/tvhead.h
index 7814b38644519596ca1b810c9f0fb48f88cca37a..8a39173c480978cc995cd95c412d4c769613c393 100644 (file)
--- a/src/tvhead.h
+++ b/src/tvhead.h
@@ -838,4 +838,6 @@ void hexdump(const char *pfx, const uint8_t *data, int len);
 
 uint32_t crc32(uint8_t *data, size_t datalen, uint32_t crc);
 
+int base64_decode(uint8_t *out, const char *in, int out_size);
+
 #endif /* TV_HEAD_H */

diff --git a/src/utils.c b/src/utils.c
index 2b69a9016b22dc9bd2d391908f031fcb170645c4..9a92c54cb50a28afeaa4bf98c3401a9f0d0431c9 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -90,3 +90,49 @@ hexdump(const char *pfx, const uint8_t *data, int len)
     printf("%02x.", data[i]);
   printf("\n");
 }
+
+
+
+/**
+ * @file
+ * @brief Base64 encode/decode
+ * @author Ryan Martell <rdm4@martellventures.com> (with lots of Michael)
+ */
+
+
+/* ---------------- private code */
+static const uint8_t map2[] =
+{
+    0x3e, 0xff, 0xff, 0xff, 0x3f, 0x34, 0x35, 0x36,
+    0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01,
+    0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+    0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
+    0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1a, 0x1b,
+    0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
+    0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
+    0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33
+};
+
+int 
+base64_decode(uint8_t *out, const char *in, int out_size)
+{
+    int i, v;
+    uint8_t *dst = out;
+
+    v = 0;
+    for (i = 0; in[i] && in[i] != '='; i++) {
+        unsigned int index= in[i]-43;
+        if (index >= sizeof(map2) || map2[index] == 0xff)
+            return -1;
+        v = (v << 6) + map2[index];
+        if (i & 3) {
+            if (dst - out < out_size) {
+                *dst++ = v >> (6 - 2 * (i & 3));
+            }
+        }
+    }
+
+    return dst - out;
+}