diff options
| author |   Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-11-22 09:33:09 -0800 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2020-12-14 11:00:29 +0100 |
| commit | df5f5b6f5be561d62e5a5771f0dc5ac34302bb0b (patch) | |
| tree | bf7fbb32053fd0da6380eea9038ea1ae499ce304 | |
| parent | [3.7] bpo-42103: Improve validation of Plist files. (GH-22882) (#23117) (diff) | |
| download | cpython-df5f5b6f5be561d62e5a5771f0dc5ac34302bb0b.tar.gz cpython-df5f5b6f5be561d62e5a5771f0dc5ac34302bb0b.tar.bz2 cpython-df5f5b6f5be561d62e5a5771f0dc5ac34302bb0b.zip | |
bpo-40791: Make compare_digest more constant-time. (GH-23438)gentoo-3.7.9-r1
The existing volatile `left`/`right` pointers guarantee that the reads will all occur, but does not guarantee that they will be _used_. So a compiler can still short-circuit the loop, saving e.g. the overhead of doing the xors and especially the overhead of the data dependency between `result` and the reads. That would change performance depending on where the first unequal byte occurs. This change removes that optimization.
(This is change GH-1 from https://bugs.python.org/issue40791 .)
(cherry picked from commit 31729366e2bc09632e78f3896dbce0ae64914f28)
Co-authored-by: Devin Jeanpierre <jeanpierreda@google.com>
| -rw-r--r-- | Misc/NEWS.d/next/Security/2020-05-28-06-06-47.bpo-40791.QGZClX.rst | 1 | ||||
| -rw-r--r-- | Modules/_operator.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Security/2020-05-28-06-06-47.bpo-40791.QGZClX.rst b/Misc/NEWS.d/next/Security/2020-05-28-06-06-47.bpo-40791.QGZClX.rst new file mode 100644 index 00000000000..69b9de1beae --- /dev/null +++ b/Misc/NEWS.d/next/Security/2020-05-28-06-06-47.bpo-40791.QGZClX.rst @@ -0,0 +1 @@ +Add ``volatile`` to the accumulator variable in ``hmac.compare_digest``, making constant-time-defeating optimizations less likely.
\ No newline at end of file diff --git a/Modules/_operator.c b/Modules/_operator.c index 51daa1ff6cf..7fff654ca61 100644 --- a/Modules/_operator.c +++ b/Modules/_operator.c @@ -735,7 +735,7 @@ _tscmp(const unsigned char *a, const unsigned char *b, volatile const unsigned char *left; volatile const unsigned char *right; Py_ssize_t i; - unsigned char result; + volatile unsigned char result; /* loop count depends on length of b */ length = len_b; |