Skip to content

Replace std::array with std::span in roughtime hashNode function #4994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randombit merged 1 commit into from
Jul 15, 2025
Merged

Replace std::array with std::span in roughtime hashNode function #4994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/lib/misc/roughtime/roughtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <botan/pubkey.h>
#include <botan/rng.h>
#include <botan/internal/socket_udp.h>
#include <botan/internal/stl_util.h>

#include <cmath>
#include <map>
Expand Down Expand Up @@ -131,7 +132,7 @@ std::array<uint8_t, 64> hashLeaf(const std::array<uint8_t, 64>& leaf) {
return ret;
}

void hashNode(std::array<uint8_t, 64>& hash, const std::array<uint8_t, 64>& node, bool reverse) {
void hashNode(std::span<uint8_t, 64> hash, std::span<const uint8_t, 64> node, bool reverse) {
auto h = HashFunction::create_or_throw("SHA-512");
h->update(1);
if(reverse) {
Expand Down Expand Up @@ -199,12 +200,11 @@ Response Response::from_bits(const std::vector<uint8_t>& response, const Nonce&
throw Roughtime_Error("Merkle tree path is too short");
}

BufferSlicer slicer(path);
auto hash = hashLeaf(nonce.get_nonce());
auto index = indx;
size_t level = 0;
while(level < levels) {
hashNode(hash, typecast_copy<std::array<uint8_t, 64>>(path.data() + level * 64), index & 1);
++level;
for(std::size_t level = 0; level < levels; ++level) {
hashNode(hash, slicer.take<64>(), index & 1);
index >>= 1;
}

Expand Down
Loading