diff options
| author | jeffro256 <jeffro256@tutanota.com> | 2025-01-09 00:48:51 -0600 |
|---|---|---|
| committer | jeffro256 <jeffro256@tutanota.com> | 2025-01-09 12:01:06 -0600 |
| commit | 27858049da753ea7d0ce44829a6c06f1597d72d5 (patch) | |
| tree | 74836a44ea9657585dee0c56c662851dedfe6378 /src/crypto | |
| parent | 2fe0f04c1e2eafdea998aa96fa5c116cc871696b (diff) | |
| download | monzero-core-27858049da753ea7d0ce44829a6c06f1597d72d5.tar.gz monzero-core-27858049da753ea7d0ce44829a6c06f1597d72d5.tar.xz monzero-core-27858049da753ea7d0ce44829a6c06f1597d72d5.zip | |
crypto: make CRYPTO_DEFINE_HASH_FUNCTIONS adhere strict aliasing
This code could've caused issues if the pointer to the `public_key`, `key_image`, `hash`, etc wasn't aligned on an 8-byte boundary.
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/generic-ops.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/crypto/generic-ops.h b/src/crypto/generic-ops.h index 5a5e09f9b..3ff3619fe 100644 --- a/src/crypto/generic-ops.h +++ b/src/crypto/generic-ops.h @@ -33,6 +33,7 @@ #include <cstddef> #include <cstring> #include <functional> +#include <memory> #include <sodium/crypto_verify_32.h> #define CRYPTO_MAKE_COMPARABLE(type) \ @@ -60,14 +61,18 @@ namespace crypto { \ namespace crypto { \ static_assert(sizeof(std::size_t) <= sizeof(type), "Size of " #type " must be at least that of size_t"); \ inline std::size_t hash_value(const type &_v) { \ - return reinterpret_cast<const std::size_t &>(_v); \ + std::size_t h; \ + memcpy(&h, std::addressof(_v), sizeof(h)); \ + return h; \ } \ } \ namespace std { \ template<> \ struct hash<crypto::type> { \ std::size_t operator()(const crypto::type &_v) const { \ - return reinterpret_cast<const std::size_t &>(_v); \ + std::size_t h; \ + memcpy(&h, std::addressof(_v), sizeof(h)); \ + return h; \ } \ }; \ } |
