bpo-40791: Make compare_digest more constant-time. (GH-23438) (GH-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 31729366e2
)
Co-authored-by: Devin Jeanpierre <jeanpierreda@google.com>
This commit is contained in:
parent
dae5d728bc
commit
8bef9ebb1b
|
@ -0,0 +1 @@
|
|||
Add ``volatile`` to the accumulator variable in ``hmac.compare_digest``, making constant-time-defeating optimizations less likely.
|
|
@ -184,7 +184,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;
|
||||
|
|
Loading…
Reference in New Issue