Skip to content

Commit

Permalink
CVE-2022-48566 Cherry-pick 8bef9eb
Browse files Browse the repository at this point in the history
bpo-40791: Make compare_digest more constant-time. (pythonGH-23438) (pythonGH-23767)

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 3172936)

Co-authored-by: Devin Jeanpierre <[email protected]>
(cherry picked from commit 8bef9eb)
  • Loading branch information
miss-islington authored and icanhasmath committed Jun 26, 2024
1 parent a8b38fd commit aa83358
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``volatile`` to the accumulator variable in ``hmac.compare_digest``, making constant-time-defeating optimizations less likely.
2 changes: 1 addition & 1 deletion Modules/operator.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,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;
Expand Down

0 comments on commit aa83358

Please sign in to comment.