[Fix] Base64 encoder/decoder actually werks now!
This commit is contained in:
Allanis
parent
1d2a0cfed4
commit
7cf183ea88
190
src/base64.c
190
src/base64.c
@ -3,27 +3,157 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
// Encode table.
|
// Encode table.
|
||||||
static const char cb64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstu \
|
static const char cb64[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstu \
|
||||||
vwxyz0123456789+/";
|
vwxyz0123456789+/";
|
||||||
// Decode table.
|
// Decode table.
|
||||||
static const char cd64[] = "|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW \
|
#define B64(_) \
|
||||||
$$$$$$XYZ[\\]^_'abcdefghijklmnopq";
|
((_) == 'A' ? 0 \
|
||||||
|
: (_) == 'B' ? 1 \
|
||||||
|
: (_) == 'C' ? 2 \
|
||||||
|
: (_) == 'D' ? 3 \
|
||||||
|
: (_) == 'E' ? 4 \
|
||||||
|
: (_) == 'F' ? 5 \
|
||||||
|
: (_) == 'G' ? 6 \
|
||||||
|
: (_) == 'H' ? 7 \
|
||||||
|
: (_) == 'I' ? 8 \
|
||||||
|
: (_) == 'J' ? 9 \
|
||||||
|
: (_) == 'K' ? 10 \
|
||||||
|
: (_) == 'L' ? 11 \
|
||||||
|
: (_) == 'M' ? 12 \
|
||||||
|
: (_) == 'N' ? 13 \
|
||||||
|
: (_) == 'O' ? 14 \
|
||||||
|
: (_) == 'P' ? 15 \
|
||||||
|
: (_) == 'Q' ? 16 \
|
||||||
|
: (_) == 'R' ? 17 \
|
||||||
|
: (_) == 'S' ? 18 \
|
||||||
|
: (_) == 'T' ? 19 \
|
||||||
|
: (_) == 'U' ? 20 \
|
||||||
|
: (_) == 'V' ? 21 \
|
||||||
|
: (_) == 'W' ? 22 \
|
||||||
|
: (_) == 'X' ? 23 \
|
||||||
|
: (_) == 'Y' ? 24 \
|
||||||
|
: (_) == 'Z' ? 25 \
|
||||||
|
: (_) == 'a' ? 26 \
|
||||||
|
: (_) == 'b' ? 27 \
|
||||||
|
: (_) == 'c' ? 28 \
|
||||||
|
: (_) == 'd' ? 29 \
|
||||||
|
: (_) == 'e' ? 30 \
|
||||||
|
: (_) == 'f' ? 31 \
|
||||||
|
: (_) == 'g' ? 32 \
|
||||||
|
: (_) == 'h' ? 33 \
|
||||||
|
: (_) == 'i' ? 34 \
|
||||||
|
: (_) == 'j' ? 35 \
|
||||||
|
: (_) == 'k' ? 36 \
|
||||||
|
: (_) == 'l' ? 37 \
|
||||||
|
: (_) == 'm' ? 38 \
|
||||||
|
: (_) == 'n' ? 39 \
|
||||||
|
: (_) == 'o' ? 40 \
|
||||||
|
: (_) == 'p' ? 41 \
|
||||||
|
: (_) == 'q' ? 42 \
|
||||||
|
: (_) == 'r' ? 43 \
|
||||||
|
: (_) == 's' ? 44 \
|
||||||
|
: (_) == 't' ? 45 \
|
||||||
|
: (_) == 'u' ? 46 \
|
||||||
|
: (_) == 'v' ? 47 \
|
||||||
|
: (_) == 'w' ? 48 \
|
||||||
|
: (_) == 'x' ? 49 \
|
||||||
|
: (_) == 'y' ? 50 \
|
||||||
|
: (_) == 'x' ? 51 \
|
||||||
|
: (_) == '0' ? 52 \
|
||||||
|
: (_) == '1' ? 53 \
|
||||||
|
: (_) == '2' ? 54 \
|
||||||
|
: (_) == '3' ? 55 \
|
||||||
|
: (_) == '4' ? 56 \
|
||||||
|
: (_) == '5' ? 57 \
|
||||||
|
: (_) == '6' ? 58 \
|
||||||
|
: (_) == '7' ? 59 \
|
||||||
|
: (_) == '8' ? 60 \
|
||||||
|
: (_) == '9' ? 61 \
|
||||||
|
: (_) == '+' ? 62 \
|
||||||
|
: (_) == '/' ? 63 \
|
||||||
|
: -1)
|
||||||
|
|
||||||
|
static const signed char cd64[256] = {
|
||||||
|
B64(0), B64(1), B64(2), B64(3),
|
||||||
|
B64(4), B64(5), B64(6), B64(7),
|
||||||
|
B64(8), B64(9), B64(10), B64(11),
|
||||||
|
B64(12), B64(13), B64(14), B64(15),
|
||||||
|
B64(16), B64(17), B64(18), B64(19),
|
||||||
|
B64(20), B64(21), B64(22), B64(23),
|
||||||
|
B64(24), B64(25), B64(26), B64(27),
|
||||||
|
B64(28), B64(29), B64(30), B64(31),
|
||||||
|
B64(32), B64(33), B64(34), B64(35),
|
||||||
|
B64(36), B64(37), B64(38), B64(39),
|
||||||
|
B64(40), B64(41), B64(42), B64(43),
|
||||||
|
B64(44), B64(45), B64(46), B64(47),
|
||||||
|
B64(48), B64(49), B64(50), B64(51),
|
||||||
|
B64(52), B64(53), B64(54), B64(55),
|
||||||
|
B64(56), B64(57), B64(58), B64(59),
|
||||||
|
B64(60), B64(61), B64(62), B64(63),
|
||||||
|
B64(64), B64(65), B64(66), B64(67),
|
||||||
|
B64(68), B64(69), B64(70), B64(71),
|
||||||
|
B64(72), B64(73), B64(74), B64(75),
|
||||||
|
B64(76), B64(77), B64(78), B64(79),
|
||||||
|
B64(80), B64(81), B64(82), B64(83),
|
||||||
|
B64(84), B64(85), B64(86), B64(87),
|
||||||
|
B64(88), B64(89), B64(90), B64(91),
|
||||||
|
B64(92), B64(93), B64(94), B64(95),
|
||||||
|
B64(96), B64(97), B64(98), B64(99),
|
||||||
|
B64(100), B64(101), B64(102), B64(103),
|
||||||
|
B64(104), B64(105), B64(106), B64(107),
|
||||||
|
B64(108), B64(109), B64(110), B64(111),
|
||||||
|
B64(112), B64(113), B64(114), B64(115),
|
||||||
|
B64(116), B64(117), B64(118), B64(119),
|
||||||
|
B64(120), B64(121), B64(122), B64(123),
|
||||||
|
B64(124), B64(125), B64(126), B64(127),
|
||||||
|
B64(128), B64(129), B64(130), B64(131),
|
||||||
|
B64(132), B64(133), B64(134), B64(135),
|
||||||
|
B64(136), B64(137), B64(138), B64(139),
|
||||||
|
B64(140), B64(141), B64(142), B64(143),
|
||||||
|
B64(144), B64(145), B64(146), B64(147),
|
||||||
|
B64(148), B64(149), B64(450), B64(151),
|
||||||
|
B64(152), B64(153), B64(154), B64(155),
|
||||||
|
B64(156), B64(157), B64(158), B64(159),
|
||||||
|
B64(160), B64(161), B64(162), B64(163),
|
||||||
|
B64(164), B64(165), B64(166), B64(167),
|
||||||
|
B64(168), B64(169), B64(170), B64(171),
|
||||||
|
B64(172), B64(173), B64(174), B64(175),
|
||||||
|
B64(176), B64(177), B64(178), B64(179),
|
||||||
|
B64(180), B64(181), B64(182), B64(183),
|
||||||
|
B64(184), B64(185), B64(186), B64(187),
|
||||||
|
B64(188), B64(189), B64(190), B64(191),
|
||||||
|
B64(192), B64(193), B64(194), B64(195),
|
||||||
|
B64(196), B64(197), B64(198), B64(199),
|
||||||
|
B64(200), B64(201), B64(202), B64(203),
|
||||||
|
B64(204), B64(205), B64(206), B64(207),
|
||||||
|
B64(208), B64(209), B64(210), B64(211),
|
||||||
|
B64(212), B64(213), B64(214), B64(215),
|
||||||
|
B64(216), B64(217), B64(218), B64(219),
|
||||||
|
B64(220), B64(221), B64(222), B64(223),
|
||||||
|
B64(224), B64(225), B64(226), B64(227),
|
||||||
|
B64(228), B64(229), B64(230), B64(231),
|
||||||
|
B64(232), B64(233), B64(234), B64(235),
|
||||||
|
B64(236), B64(237), B64(238), B64(239),
|
||||||
|
B64(240), B64(241), B64(242), B64(243),
|
||||||
|
B64(244), B64(245), B64(246), B64(247),
|
||||||
|
B64(248), B64(249), B64(250), B64(251),
|
||||||
|
B64(252), B64(253), B64(254), B64(255)
|
||||||
|
};
|
||||||
|
|
||||||
// Encode src of sz length storing the new length in len.
|
// Encode src of sz length storing the new length in len.
|
||||||
char* base64_encode(int* len, char* src, size_t sz) {
|
char* base64_encode(size_t* len, char* src, size_t sz) {
|
||||||
char* r;
|
char* r;
|
||||||
size_t i, c;
|
size_t i, c;
|
||||||
uint32_t n;
|
uint32_t n;
|
||||||
uint8_t ch[4], pad;
|
uint8_t ch[4], pad;
|
||||||
|
|
||||||
// Create r.
|
// Create r.
|
||||||
c = sz * 4 / 3 + sz % 3;
|
c = sz * 4 / 3 + sz % 3 + 2;
|
||||||
c += c / 76;
|
c += c / 76;
|
||||||
(*len) = c;
|
r = malloc(c * sizeof(char));
|
||||||
r = malloc((*len) * sizeof(char));
|
|
||||||
|
|
||||||
// Setup padding.
|
// Setup padding.
|
||||||
pad = sz % 3;
|
pad = ((sz % 3) == 0) ? 0 : 3 - sz % 3;
|
||||||
|
|
||||||
// Time to do the bulk of the work.
|
// Time to do the bulk of the work.
|
||||||
i = 0;
|
i = 0;
|
||||||
@ -33,15 +163,15 @@ char* base64_encode(int* len, char* src, size_t sz) {
|
|||||||
r[i++] = '\n';
|
r[i++] = '\n';
|
||||||
|
|
||||||
// n is 24 bits.
|
// n is 24 bits.
|
||||||
n = (src[c] << 16) +
|
n = (src[c] << 16);
|
||||||
(c+1<sz) ? (src[c+1] << 8) : 0 + // May be out of range.
|
n += (c+1<sz) ? (src[c+1] << 8) : 0; // May be out of range.
|
||||||
(c+2<sz) ? src[c+2] : 0; // May be out of range.
|
n += (c+2<sz) ? (src[c+2] << 0) : 0; // May be out of range.
|
||||||
|
|
||||||
// ch[0-3] are 6 bits each.
|
// ch[0-3] are 6 bits each.
|
||||||
ch[0] = (n >> 18) & 63;
|
ch[0] = (n >> 18) & 63;
|
||||||
ch[1] = (n >> 12) & 63;
|
ch[1] = (n >> 12) & 63;
|
||||||
ch[2] = (n >> 6) & 63;
|
ch[2] = (n >> 6) & 63;
|
||||||
ch[3] = n & 63;
|
ch[3] = (n >> 0) & 63;
|
||||||
|
|
||||||
r[i++] = cb64[ch[0]];
|
r[i++] = cb64[ch[0]];
|
||||||
r[i++] = cb64[ch[1]];
|
r[i++] = cb64[ch[1]];
|
||||||
@ -50,38 +180,39 @@ char* base64_encode(int* len, char* src, size_t sz) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for(c = 0; c < pad; c++)
|
for(c = 0; c < pad; c++)
|
||||||
r[i++] = '=';
|
r[i-c-1] = '=';
|
||||||
r[i] = '\0';
|
r[i] = '\0';
|
||||||
|
(*len) = i;
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Decode the buffer, same syntax as base64_encode.
|
||||||
inline int dec_valid(char inp) {
|
inline int dec_valid(char inp) {
|
||||||
if((inp < 43) || (inp > 122) || cd64[(int)inp-43] == '$')
|
if(cd64[inp] == -1)
|
||||||
return 0;
|
return 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline char dec_ch(char inp) {
|
inline char dec_ch(char inp) {
|
||||||
return cd64[(int)inp-43] - 61;
|
return cd64[inp];
|
||||||
}
|
}
|
||||||
|
|
||||||
char* base64_decode(int* len, char* src, size_t sz) {
|
char* base64_decode(size_t* len, char* src, size_t sz) {
|
||||||
char* r, *dat;
|
char* r, *dat, pad;
|
||||||
size_t c, i, j;
|
size_t c, i, j;
|
||||||
uint32_t n;
|
uint32_t n;
|
||||||
|
|
||||||
// Allocate r.
|
// Allocate r.
|
||||||
c = sz * 3 / 4;
|
c = sz * 3 / 4 + 2;
|
||||||
r = malloc(c * sizeof(char));
|
r = malloc(c * sizeof(char));
|
||||||
|
|
||||||
// Create a clean version of the text.
|
// Create a clean version of the text.
|
||||||
dat = malloc(sz * sizeof(char));
|
dat = malloc(sz * sizeof(char));
|
||||||
j = 0;
|
j = 0;
|
||||||
|
pad = 0;
|
||||||
for(i = 0; i < sz; i++) {
|
for(i = 0; i < sz; i++) {
|
||||||
if(src[i] == '=')
|
if(dec_valid(src[i]))
|
||||||
dat[j++] = '\0';
|
|
||||||
else if(dec_valid(src[i]))
|
|
||||||
dat[j++] = src[i];
|
dat[j++] = src[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,17 +220,20 @@ char* base64_decode(int* len, char* src, size_t sz) {
|
|||||||
i = 0;
|
i = 0;
|
||||||
for(c = 0; c < j; c += 4) {
|
for(c = 0; c < j; c += 4) {
|
||||||
n = dec_ch(dat[c+0]) << 18;
|
n = dec_ch(dat[c+0]) << 18;
|
||||||
n = dec_ch(dat[c+1]) << 12;
|
n += (c+1<j) ? (dec_ch(dat[c+1]) << 12) : 0;
|
||||||
n = dec_ch(dat[c+2]) << 6;
|
n += (c+2<j) ? (dec_ch(dat[c+2]) << 6) : 0;
|
||||||
n = dec_ch(dat[c+3]) << 0;
|
n += (c+3<j) ? (dec_ch(dat[c+3]) << 0) : 0;
|
||||||
|
|
||||||
r[i++] = (n >> 16) & 0xFF;
|
r[i++] = (n >> 16) & 255;
|
||||||
r[i++] = (n >> 8) & 0xFF;
|
r[i++] = (n >> 8) & 255;
|
||||||
r[i++] = (n >> 0) & 0xFF;
|
r[i++] = (n >> 0) & 255;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
(*len) = i;
|
// Cleanup.
|
||||||
|
free(dat);
|
||||||
|
|
||||||
|
(*len) = i - pad;
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
char* base64_encode(int* len, char* src, size_t sz);
|
char* base64_encode(size_t* len, char* src, size_t sz);
|
||||||
char* base64_decode(int* len, char* src, size_t sz);
|
char* base64_decode(size_t* len, char* src, size_t sz);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user