Local base64 decoder
This commit is contained in:
parent
0a6bc7653a
commit
9bb63f3dcc
3 changed files with 49 additions and 3 deletions
|
@ -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]);
|
||||
|
|
|
@ -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 */
|
||||
|
|
46
src/utils.c
46
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;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue