BlockStorage/repertory
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

Merge branch 'v2.1.0-rc-develop' of https://git.fifthgrid.com/blockstorage/repertory into v2.1.0-rc-develop

Browse Source
This commit is contained in:
Scott E. Graves
2025-08-29 09:04:14 -05:00
parent 57213c007f 69d91413fc
commit 087a2d0d6d
14 changed files with 1016 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp
View File

@@ -806,11 +806,11 @@ auto encrypt_provider::read_file_bytes(const std::string &api_path,
} else if (not reader_lookup_.contains(file_data.source_path)) {
auto info{std::make_shared<reader_info>()};
info->reader = std::make_unique<utils::encryption::encrypting_reader>(
api_path, file_data.source_path,
[&stop_requested]() -> bool {
return stop_requested || app_config::get_stop_requested();
},
cfg.encryption_token, std::move(file_data.iv_list));
api_path, file_data.source_path, cfg.encryption_token,
std::move(file_data.iv_list));
reader_lookup_[file_data.source_path] = info;
}

2
repertory/librepertory/src/providers/s3/s3_provider.cpp
View File

@@ -1063,7 +1063,7 @@ auto s3_provider::upload_file_impl(const std::string &api_path,
put_file.reader = std::make_shared<utils::encryption::encrypting_reader>(
object_name, source_path,
[]() -> bool { return app_config::get_stop_requested(); },
cfg.encryption_token, -1);
cfg.encryption_token, std::nullopt, -1);
}
long response_code{};