MrBesen
/
libmrbesen
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

updated base64

This commit is contained in:
mrbesen 2020-10-05 14:18:07 +02:00
parent ddbe2f089e
commit fe6e8e27c6
Signed by: MrBesen
GPG Key ID: 596B2350DCD67504
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/util.cpp
View File

@ -144,8 +144,6 @@ std::string mrbesen::Util::bytesToBase64(char* buffer, unsigned int len) {
if(len == 0) return ""; if(len == 0) return "";
const uint8_t overlen = len % 3;
const uint8_t len_padding = overlen ? (3 - overlen) : 0; //anzahl benötigter padding chars
size_t len_encoded = (len+2) / 3 * 4; size_t len_encoded = (len+2) / 3 * 4;
static const unsigned char trailing_char = '='; static const unsigned char trailing_char = '=';
@ -154,30 +152,24 @@ std::string mrbesen::Util::bytesToBase64(char* buffer, unsigned int len) {
std::string ret; std::string ret;
ret.reserve(len_encoded); ret.reserve(len_encoded);
char nextb = 0; for(unsigned int pos = 0; pos < len; pos += 3) {
for(unsigned int pos = 0; pos < len; pos ++) { ret.push_back(base64_chars[(buffer[pos] & 0xfc) >> 2]);
const char c = buffer[pos]; if (pos+1 < len) {
uint8_t tripos = pos % 3; //position im trible ret.push_back(base64_chars[((buffer[pos] & 0x03) << 4) + ((buffer[pos + 1] & 0xf0) >> 4)]);
uint8_t maskShift = (1+tripos) << 1; //2, 4, 6 if (pos+2 < len) {
uint8_t mask = 0xff << maskShift; ret.push_back(base64_chars[((buffer[pos + 1] & 0x0f) << 2) + ((buffer[pos + 2] & 0xc0) >> 6)]);
ret.push_back(base64_chars[((c & mask) >> maskShift) | nextb]); ret.push_back(base64_chars[ buffer[pos + 2] & 0x3f]);
} else {
if(tripos == 2) { ret.push_back(base64_chars[(buffer[pos + 1] & 0x0f) << 2]);
ret.push_back(base64_chars[c & ~mask]); ret.push_back(trailing_char);
nextb = 0; }
} else { } else {
uint8_t invmaskShift = 6 - maskShift; ret.push_back(base64_chars[(buffer[pos] & 0x03) << 4]);
nextb = (c & ~mask) << invmaskShift; ret.push_back(trailing_char);
ret.push_back(trailing_char);
} }
} }
if(nextb)
ret.push_back(base64_chars[(int) nextb]);
for(uint8_t i = 0; i < len_padding; ++i) {
ret.push_back(trailing_char);
}
return ret; return ret;
} }

5
tests/utilstest.cpp
View File

@ -171,7 +171,7 @@ int testUtil_trim() {
} }
int testUtil_base() { int testUtil_base() {
char buf[] {0, (char) 0xAB, (char) 0x12, (char) 0xCD, (char) 0x34}; char buf[] {0, (char) 0xAB, (char) 0x12, (char) 0xCD, (char) 0x34, (char) 0xFF};
std::string ret = bytesToBase16(buf, 5); std::string ret = bytesToBase16(buf, 5);
ASSERT(ret == "00ab12cd34", ret); ASSERT(ret == "00ab12cd34", ret);
@ -188,5 +188,8 @@ int testUtil_base() {
ret = bytesToBase64(buf, 0); ret = bytesToBase64(buf, 0);
ASSERT(ret == "", ret); ASSERT(ret == "", ret);
ret = bytesToBase64(buf, 6);
ASSERT(ret == "AKsSzTT_", ret);
return TESTGOOD; return TESTGOOD;
} }