unify with snowcone

This commit is contained in:
2025-02-05 09:24:47 -08:00
parent 5f2439e5af
commit 2b4bb1f071
20 changed files with 589 additions and 483 deletions

View File

@@ -2,15 +2,14 @@
* @file mybase64.hpp
* @author Eric Mertens (emertens@gmail.com)
* @brief Base64 encoding and decoding
*
*
*/
#pragma once
#include <cstddef>
#include <string_view>
namespace mybase64
{
namespace mybase64 {
inline constexpr auto encoded_size(std::size_t len) -> std::size_t
{
@@ -24,7 +23,7 @@ inline constexpr auto decoded_size(std::size_t len) -> std::size_t
/**
* @brief Encode a string into base64
*
*
* @param input input text
* @param output Target buffer for encoded value
*/
@@ -32,13 +31,11 @@ auto encode(std::string_view input, char* output) -> void;
/**
* @brief Decode a base64 encoded string
*
*
* @param input Base64 input text
* @param output Target buffer for decoded value
* @param outlen Output parameter for decoded length
* @return true success
* @return false failure
* @return pointer to end of output on success
*/
auto decode(std::string_view input, char* output, std::size_t* outlen) -> bool;
auto decode(std::string_view input, char* output) -> char*;
} // namespace

View File

@@ -1,113 +1,102 @@
#include "mybase64.hpp"
#include <array>
#include <climits>
#include <cstdint>
#include <string_view>
namespace mybase64
{
namespace mybase64 {
namespace {
constexpr std::array<char, 64> alphabet{
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
};
constexpr std::array<std::int8_t, 256> alphabet_values = []() constexpr {
std::array<std::int8_t, 256> result;
result.fill(-1);
std::int8_t v = 0;
for (auto const k : alphabet)
{
result[k] = v++;
}
return result;
}();
}
static_assert(CHAR_BIT == 8);
auto encode(std::string_view const input, char* output) -> void
{
static char const* const alphabet =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789+/";
auto cursor = std::begin(input);
auto const end = std::end(input);
auto cursor = std::begin(input);
auto const end = std::end(input);
while (end - cursor >= 3)
{
std::uint32_t buffer = std::uint8_t(*cursor++);
buffer <<= 8;
buffer |= std::uint8_t(*cursor++);
buffer <<= 8;
buffer |= std::uint8_t(*cursor++);
while (end - cursor >= 3)
{
uint32_t buffer = uint8_t(*cursor++);
buffer <<= 8; buffer |= uint8_t(*cursor++);
buffer <<= 8; buffer |= uint8_t(*cursor++);
*output++ = alphabet[(buffer >> 6 * 3) % 64];
*output++ = alphabet[(buffer >> 6 * 2) % 64];
*output++ = alphabet[(buffer >> 6 * 1) % 64];
*output++ = alphabet[(buffer >> 6 * 0) % 64];
}
*output++ = alphabet[(buffer >> 6 * 3) % 64];
*output++ = alphabet[(buffer >> 6 * 2) % 64];
*output++ = alphabet[(buffer >> 6 * 1) % 64];
*output++ = alphabet[(buffer >> 6 * 0) % 64];
}
if (cursor < end)
{
std::uint32_t buffer = std::uint8_t(*cursor++) << 10;
if (cursor < end)
buffer |= std::uint8_t(*cursor) << 2;
if (cursor < end)
{
uint32_t buffer = uint8_t(*cursor++) << 10;
if (cursor < end) buffer |= uint8_t(*cursor) << 2;
*output++ = alphabet[(buffer >> 12) % 64];
*output++ = alphabet[(buffer >> 6) % 64];
*output++ = cursor < end ? alphabet[(buffer % 64)] : '=';
*output++ = '=';
}
*output = '\0';
*output++ = alphabet[(buffer >> 12) % 64];
*output++ = alphabet[(buffer >> 6) % 64];
*output++ = cursor < end ? alphabet[(buffer % 64)] : '=';
*output++ = '=';
}
*output = '\0';
}
auto decode(std::string_view const input, char* const output, std::size_t* const outlen) -> bool
auto decode(std::string_view const input, char* output) -> char*
{
static int8_t const alphabet_values[] = {
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 0x3e, -1, -1, -1, 0x3f,
0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
0x3c, 0x3d, -1, -1, -1, -1, -1, -1,
-1, 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, -1, -1, -1, -1, -1,
-1, 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, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
};
std::uint32_t buffer = 1;
uint32_t buffer = 1;
char* cursor = output;
for (char c : input) {
int8_t const value = alphabet_values[uint8_t(c)];
if (-1 == value) continue;
buffer = (buffer << 6) | value;
if (buffer & 1<<6*4) {
*cursor++ = buffer >> 8*2;
*cursor++ = buffer >> 8*1;
*cursor++ = buffer >> 8*0;
buffer = 1;
for (auto const c : input)
{
if (auto const value = alphabet_values[uint8_t(c)]; -1 != value)
{
buffer = (buffer << 6) | value;
if (buffer & 1 << 6 * 4)
{
*output++ = buffer >> 16;
*output++ = buffer >> 8;
*output++ = buffer >> 0;
buffer = 1;
}
}
}
if (buffer & 1<<6*3) {
*cursor++ = buffer >> 10;
*cursor++ = buffer >> 2;
} else if (buffer & 1<<6*2) {
*cursor++ = buffer >> 4;
} else if (buffer & 1<<6*1) {
return false;
if (buffer & 1 << 6 * 3)
{
*output++ = buffer >> 10;
*output++ = buffer >> 2;
}
*outlen = cursor - output;
return true;
else if (buffer & 1 << 6 * 2)
{
*output++ = buffer >> 4;
}
else if (buffer & 1 << 6 * 1)
{
return nullptr;
}
return output;
}
} // namespace