sek1ro/libbasen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(baseN): const &data, isValid on algorithm

Browse Source
This commit is contained in:
SEK1RO
2024-09-15 21:58:52 +03:00
parent d6bbe43ec0
commit 2a89a56011
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/base/baseN.hpp
View File

@ -10,8 +10,8 @@ namespace baseN
bool isValid(const std::string &str, const int8_t *map) noexcept; bool isValid(const std::string &str, const int8_t *map) noexcept;
void encode(const uint8_t *data, uint64_t data_size, char *str, uint8_t base, const char *digits, uint64_t enc_size) noexcept; void encode(const uint8_t *data, uint64_t data_size, char *str, uint8_t base, const char *digits, uint64_t enc_size) noexcept;
std::string encode(std::vector<uint8_t> data, uint8_t base, const char *digits, uint64_t enc_size) noexcept; std::string encode(const std::vector<uint8_t> &data, uint8_t base, const char *digits, uint64_t enc_size) noexcept;
std::string encode(std::vector<uint8_t> data, uint8_t base, const char *digits) noexcept; std::string encode(const std::vector<uint8_t> &data, uint8_t base, const char *digits) noexcept;
void decode(const char *str, uint8_t *data, uint64_t data_size, uint8_t base, const char *digits, const int8_t *map, uint64_t dec_size); void decode(const char *str, uint8_t *data, uint64_t data_size, uint8_t base, const char *digits, const int8_t *map, uint64_t dec_size);
std::vector<uint8_t> decode(const std::string &str, uint8_t base, const char *digits, const int8_t *map, uint64_t dec_size); std::vector<uint8_t> decode(const std::string &str, uint8_t base, const char *digits, const int8_t *map, uint64_t dec_size);

28
src/baseN.cpp
View File

@ -9,20 +9,13 @@ namespace baseN
bool isValid(const char *str, const int8_t *map) noexcept bool isValid(const char *str, const int8_t *map) noexcept
{ {
std::string_view sv(str); std::string_view sv(str);
for (size_t i = 0; i < sv.size(); i++) return std::all_of(sv.begin(), sv.end(), [map](char ch)
{ { return map[(int8_t)ch] != -1; });
if (map[(int8_t)str[i]] == -1)
{
return false;
}
}
return true;
} }
bool isValid(const std::string &str, const int8_t *map) noexcept bool isValid(const std::string &str, const int8_t *map) noexcept
{ {
return baseN::isValid(str.data(), map); return baseN::isValid(str.data(), map);
} }
void encode(const uint8_t *data, uint64_t data_size, char *str, uint8_t base, const char *digits, uint64_t enc_size) noexcept void encode(const uint8_t *data, uint64_t data_size, char *str, uint8_t base, const char *digits, uint64_t enc_size) noexcept
{ {
if (data_size == 0) if (data_size == 0)
@ -78,22 +71,19 @@ namespace baseN
} }
std::copy(res_str, res_str + enc_size, str); std::copy(res_str, res_str + enc_size, str);
} }
std::string encode(std::vector<uint8_t> data, uint8_t base, const char *digits, uint64_t enc_size) noexcept std::string encode(const std::vector<uint8_t> &data, uint8_t base, const char *digits, uint64_t enc_size) noexcept
{ {
std::string str(enc_size, ' '); std::string str(enc_size, ' ');
baseN::encode(data.data(), data.size(), str.data(), base, digits, enc_size); baseN::encode(data.data(), data.size(), str.data(), base, digits, enc_size);
str.erase(str.begin(), std::find_if( str.erase(str.begin(), std::find_if(
str.begin(), str.end(), [](char ch){ str.begin(), str.end(), [](char ch)
return ch != ' '; { return ch != ' '; }));
})
);
return str; return str;
} }
std::string encode(std::vector<uint8_t> data, uint8_t base, const char *digits) noexcept std::string encode(const std::vector<uint8_t> &data, uint8_t base, const char *digits) noexcept
{ {
return baseN::encode(data, base, digits, data.size() * std::log(256) / std::log(base) + 1); return baseN::encode(data, base, digits, data.size() * std::log(256) / std::log(base) + 1);
} }
void decode(const char *str, uint8_t *data, uint64_t data_size, uint8_t base, const char *digits, const int8_t *map, uint64_t dec_size) void decode(const char *str, uint8_t *data, uint64_t data_size, uint8_t base, const char *digits, const int8_t *map, uint64_t dec_size)
{ {
if (str[0] == '\0') if (str[0] == '\0')
@ -137,10 +127,8 @@ namespace baseN
std::vector<uint8_t> data(dec_size); std::vector<uint8_t> data(dec_size);
baseN::decode(str.data(), data.data(), data.size(), base, digits, map, dec_size); baseN::decode(str.data(), data.data(), data.size(), base, digits, map, dec_size);
data.erase(data.begin(), std::find_if( data.erase(data.begin(), std::find_if(
data.begin(), data.end(), [](uint8_t byte){ data.begin(), data.end(), [](uint8_t byte)
return byte != 0; { return byte != 0; }));
})
);
return data; return data;
} }
std::vector<uint8_t> decode(const std::string &str, uint8_t base, const char *digits, const int8_t *map) std::vector<uint8_t> decode(const std::string &str, uint8_t base, const char *digits, const int8_t *map)