summaryrefslogtreecommitdiff
path: root/src/buildtool/build_engine/target_map/utils.cpp
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2022-06-15 18:51:47 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2022-06-20 15:23:02 +0200
commit855affd9b681d98f248009ddb2c1abe987029f72 (patch)
tree6d4dbfc2c99020772313f381d2f793950d2b03f4 /src/buildtool/build_engine/target_map/utils.cpp
parent391d982f2fbd98a2973f14e0b5969f66c2abd756 (diff)
downloadjustbuild-855affd9b681d98f248009ddb2c1abe987029f72.tar.gz
Crypto: Refactor hash computation
... by renaming HashGenerator to (incremental) Hasher and dropping support for Git/MD5 hashes. The Hasher does not expose the actual hash implementation.
Diffstat (limited to 'src/buildtool/build_engine/target_map/utils.cpp')
-rw-r--r--src/buildtool/build_engine/target_map/utils.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/buildtool/build_engine/target_map/utils.cpp b/src/buildtool/build_engine/target_map/utils.cpp
index 136727bc..9a8622e4 100644
--- a/src/buildtool/build_engine/target_map/utils.cpp
+++ b/src/buildtool/build_engine/target_map/utils.cpp
@@ -169,12 +169,7 @@ auto hash_vector(std::vector<std::string> const& vec) -> std::string {
for (auto const& s : vec) {
hasher.Update(HashFunction::ComputeHash(s).Bytes());
}
- auto digest = std::move(hasher).Finalize();
- if (not digest) {
- Logger::Log(LogLevel::Error, "Failed to finalize hash.");
- std::terminate();
- }
- return digest->Bytes();
+ return std::move(hasher).Finalize().Bytes();
}
} // namespace
@@ -196,12 +191,7 @@ auto BuildMaps::Target::Utils::createAction(
hasher.Update(no_cache ? std::string{"N"} : std::string{"Y"});
hasher.Update(inputs_exp->ToHash());
- auto digest = std::move(hasher).Finalize();
- if (not digest) {
- Logger::Log(LogLevel::Error, "Failed to finalize hash.");
- std::terminate();
- }
- auto action_id = digest->HexString();
+ auto action_id = std::move(hasher).Finalize().HexString();
std::map<std::string, std::string> env_vars{};
for (auto const& [env_var, env_value] : env->Map()) {