From 855affd9b681d98f248009ddb2c1abe987029f72 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Wed, 15 Jun 2022 18:51:47 +0200 Subject: 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. --- src/buildtool/build_engine/target_map/utils.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/buildtool/build_engine/target_map/utils.cpp') 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 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 env_vars{}; for (auto const& [env_var, env_value] : env->Map()) { -- cgit v1.2.3