Skip to content

fix: in Boost 1.90.0, sha1 digest_type is a byte array #7

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

Open
dvnrrs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: in Boost 1.90.0, sha1 digest_type is a byte array #7

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
22 changes: 17 additions & 5 deletions src/detail/websocket_protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,24 @@ std::string wss::detail::websocket_protocol::get_response_key(
sha1.get_digest(sha1_value);

std::array<char, 20> sha1_bytes;
for (unsigned i = 0; i < 5; ++i)

// In Boost ~1.90.0 and newer, boost::uuids::detail::sha1::digest_type is a byte array.
if (sizeof(sha1_value[0]) == 1)
{
std::memcpy(sha1_bytes.data(), &sha1_value, sha1_bytes.size());
}

// In Boost ~1.84.0 and older, boost::uuids::detail::sha1::digest_type
// is an array of 32-bit words which need to be byte-swapped.
else
{
sha1_bytes[4 * i + 0] = sha1_value[i] >> 24;
sha1_bytes[4 * i + 1] = sha1_value[i] >> 16;
sha1_bytes[4 * i + 2] = sha1_value[i] >> 8;
sha1_bytes[4 * i + 3] = sha1_value[i];
for (unsigned i = 0; i < 5; ++i)
{
sha1_bytes[4 * i + 0] = sha1_value[i] >> 24;
sha1_bytes[4 * i + 1] = sha1_value[i] >> 16;
sha1_bytes[4 * i + 2] = sha1_value[i] >> 8;
sha1_bytes[4 * i + 3] = sha1_value[i];
}
}

return detail::base64(sha1_bytes);
Expand Down