diff options
| author | fanquake <fanquake@gmail.com> | 2020-09-14 16:01:03 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-09-14 16:30:17 +0800 |
| commit | 06dbbe76dd027e924eb95ffc4b409daffaefe61b (patch) | |
| tree | 39ab9919ff6d0b78240f9297825f6805661d768f /src/crypto | |
| parent | ba4b3fbcf21317a9410f3be913e4437d58968091 (diff) | |
| parent | 812037cb80f72096738cf2b0c15b39536c6c1e24 (diff) | |
| download | bitcoin-06dbbe76dd027e924eb95ffc4b409daffaefe61b.tar.xz | |
Merge #19931: Change CSipHasher's count variable to uint8_t
812037cb80f72096738cf2b0c15b39536c6c1e24 Change CSipHasher's count variable to uint8_t (Pieter Wuille)
Pull request description:
SipHash technically supports arbitrarily long inputs (at least, I couldn't find a limit in the [paper](https://eprint.iacr.org/2012/351.pdf)), but only the low 8 bits of the length matter. Because of that we should use an unsigned type to track the length (as any signed type could overflow, which is UB). `uint8_t` is sufficient, however.
Fixes #19930.
ACKs for top commit:
laanwj:
anyhow re-ACK 812037cb80f72096738cf2b0c15b39536c6c1e24
elichai:
utACK 812037cb80f72096738cf2b0c15b39536c6c1e24
practicalswift:
ACK 812037cb80f72096738cf2b0c15b39536c6c1e24
theStack:
ACK 812037cb80f72096738cf2b0c15b39536c6c1e24
Tree-SHA512: 5b1440c9e4591460da198991fb421ad47d2d96def2014e761726ce361aa9575752f2c4085656e7e9badee3660ff005cc76fbd1afe4848faefe4502f3412bd896
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/siphash.cpp | 2 | ||||
| -rw-r--r-- | src/crypto/siphash.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/crypto/siphash.cpp b/src/crypto/siphash.cpp index e81957111a..2e0106b165 100644 --- a/src/crypto/siphash.cpp +++ b/src/crypto/siphash.cpp @@ -49,7 +49,7 @@ CSipHasher& CSipHasher::Write(const unsigned char* data, size_t size) { uint64_t v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3]; uint64_t t = tmp; - int c = count; + uint8_t c = count; while (size--) { t |= ((uint64_t)(*(data++))) << (8 * (c % 8)); diff --git a/src/crypto/siphash.h b/src/crypto/siphash.h index b312f913f9..6b38950f8e 100644 --- a/src/crypto/siphash.h +++ b/src/crypto/siphash.h @@ -15,7 +15,7 @@ class CSipHasher private: uint64_t v[4]; uint64_t tmp; - int count; + uint8_t count; // Only the low 8 bits of the input size matter. public: /** Construct a SipHash calculator initialized with 128-bit key (k0, k1) */ |