updated build system
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit
This commit is contained in:
@@ -35,6 +35,7 @@ inline constexpr const std::uint32_t encryption_header_size{
|
||||
crypto_aead_xchacha20poly1305_IETF_ABYTES,
|
||||
};
|
||||
|
||||
#if defined(PROJECT_ENABLE_BOOST)
|
||||
[[nodiscard]] auto decrypt_data(
|
||||
std::string_view data, std::string_view password,
|
||||
std::optional<hash_256_func_t> hasher = std::nullopt) -> data_buffer;
|
||||
@@ -43,9 +44,6 @@ inline constexpr const std::uint32_t encryption_header_size{
|
||||
std::string_view data, std::string_view password,
|
||||
std::optional<hash_256_func_t> hasher = std::nullopt) -> data_buffer;
|
||||
|
||||
[[nodiscard]] auto generate_key(std::string_view encryption_token) -> key_type;
|
||||
|
||||
#if defined(PROJECT_ENABLE_BOOST)
|
||||
template <typename result>
|
||||
[[nodiscard]] inline auto
|
||||
decrypt_data(const key_type &key, const unsigned char *buffer,
|
||||
@@ -154,6 +152,8 @@ encrypt_data(const std::array<unsigned char,
|
||||
buf.size(), res);
|
||||
}
|
||||
#endif // defined(PROJECT_ENABLE_BOOST)
|
||||
|
||||
[[nodiscard]] auto generate_key(std::string_view encryption_token) -> key_type;
|
||||
} // namespace repertory::utils::encryption
|
||||
|
||||
#endif // defined(PROJECT_ENABLE_LIBSODIUM)
|
||||
|
1
support/3rd_party/include/utils/path.hpp
vendored
1
support/3rd_party/include/utils/path.hpp
vendored
@@ -241,6 +241,7 @@ template <typename string_t>
|
||||
&paths) -> string_t {
|
||||
format_path(path, get_directory_seperator<typename string_t::value_type>(),
|
||||
get_not_directory_seperator<typename string_t::value_type>());
|
||||
|
||||
return absolute(std::accumulate(
|
||||
paths.begin(), paths.end(), path, [](auto next_path, auto &&path_part) {
|
||||
if (next_path.empty()) {
|
||||
|
5
support/3rd_party/include/utils/string.hpp
vendored
5
support/3rd_party/include/utils/string.hpp
vendored
@@ -323,7 +323,7 @@ template <typename string_t>
|
||||
inline auto replace(string_t &src, typename string_t::value_type character,
|
||||
typename string_t::value_type with,
|
||||
std::size_t start_pos) -> string_t & {
|
||||
if (not src.empty() && (start_pos < src.size())) {
|
||||
if (start_pos < src.size()) {
|
||||
std::replace(std::next(src.begin(), start_pos), src.end(), character, with);
|
||||
}
|
||||
|
||||
@@ -335,12 +335,13 @@ inline auto replace(string_t &src,
|
||||
std::basic_string_view<typename string_t::value_type> find,
|
||||
std::basic_string_view<typename string_t::value_type> with,
|
||||
std::size_t start_pos) -> string_t & {
|
||||
if (not src.empty() && (start_pos < src.size())) {
|
||||
if (start_pos < src.size()) {
|
||||
while ((start_pos = src.find(find, start_pos)) != string_t::npos) {
|
||||
src.replace(start_pos, find.size(), with);
|
||||
start_pos += with.size();
|
||||
}
|
||||
}
|
||||
|
||||
return src;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user