diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-03 08:59:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-03 08:59:59 -0500 |
| commit | 72c2292efc916a9da007108d8d019765238bb225 (patch) | |
| tree | 39019f3d5e3c034dad6c582d7d73c7514d3ec896 | |
| parent | 698e4a4780a717083e713ee0cf1f3a744f7087d7 (diff) | |
| parent | bbc9ff160e7071b7a2fa9ab200b6496580975b06 (diff) | |
| download | tor-72c2292efc916a9da007108d8d019765238bb225.tar.gz tor-72c2292efc916a9da007108d8d019765238bb225.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -rw-r--r-- | changes/bug24633 | 5 | ||||
| -rw-r--r-- | src/ext/timeouts/timeout-bitops.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug24633 b/changes/bug24633 new file mode 100644 index 0000000000..028c7cc143 --- /dev/null +++ b/changes/bug24633 @@ -0,0 +1,5 @@ + o Minor bugfixes (portability, msvc): + - Fix a bug in the bit-counting parts of our timing-wheel code on + MSVC. (Note that MSVC is still not a supported build platform, + due to cyptographic timing channel risks.) Fixes bug 24633; + bugfix on 0.2.9.1-alpha. diff --git a/src/ext/timeouts/timeout-bitops.c b/src/ext/timeouts/timeout-bitops.c index a018f33b95..45466f6cb3 100644 --- a/src/ext/timeouts/timeout-bitops.c +++ b/src/ext/timeouts/timeout-bitops.c @@ -40,7 +40,7 @@ static __inline int clz32(unsigned long val) { DWORD zeros = 0; _BitScanReverse(&zeros, val); - return zeros; + return 31 - zeros; } #ifdef _WIN64 /* According to the documentation, these only exist on Win64. */ @@ -54,7 +54,7 @@ static __inline int clz64(uint64_t val) { DWORD zeros = 0; _BitScanReverse64(&zeros, val); - return zeros; + return 63 - zeros; } #else static __inline int ctz64(uint64_t val) |