Use constant_time_eq instead of our bespoke implementation

coolreader18 · coolreader18 · commit 10fd02e42e7b · 2025-04-17T11:05:57.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -155,6 +155,7 @@ bitflags = "2.4.2"
 bstr = "1"
 cfg-if = "1.0"
 chrono = "0.4.39"
+constant_time_eq = "0.4"
 criterion = { version = "0.5", features = ["html_reports"] }
 crossbeam-utils = "0.8.21"
 flame = "0.2.2"
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -34,7 +34,6 @@ unicode_names2 = { workspace = true }
 lock_api = "0.4"
 radium = "1.1"
 siphasher = "1"
-volatile = "0.3"
 
 [target.'cfg(windows)'.dependencies]
 widestring = { workspace = true }
diff --git a/common/src/cmp.rs b/common/src/cmp.rs
diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -10,7 +10,6 @@ pub mod atomic;
 pub mod borrow;
 pub mod boxvec;
 pub mod cformat;
-pub mod cmp;
 #[cfg(any(unix, windows, target_os = "wasi"))]
 pub mod crt_fd;
 pub mod encodings;
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -51,6 +51,7 @@ bstr = { workspace = true }
 cfg-if = { workspace = true }
 crossbeam-utils = { workspace = true }
 chrono = { workspace = true, features = ["wasmbind"] }
+constant_time_eq = { workspace = true }
 flame = { workspace = true, optional = true }
 getrandom = { workspace = true }
 hex = { workspace = true }
diff --git a/vm/src/stdlib/operator.rs b/vm/src/stdlib/operator.rs
@@ -2,7 +2,6 @@ pub(crate) use _operator::make_module;
 
 #[pymodule]
 mod _operator {
-    use crate::common::cmp;
     use crate::{
         AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
         builtins::{PyInt, PyIntRef, PyStr, PyStrRef, PyTupleRef, PyTypeRef},
@@ -13,6 +12,7 @@ mod _operator {
         recursion::ReprGuard,
         types::{Callable, Constructor, PyComparisonOp, Representable},
     };
+    use constant_time_eq::constant_time_eq;
 
     #[pyfunction]
     fn lt(a: PyObjectRef, b: PyObjectRef, vm: &VirtualMachine) -> PyResult {
@@ -328,11 +328,9 @@ mod _operator {
                         "comparing strings with non-ASCII characters is not supported".to_owned(),
                     ));
                 }
-                cmp::timing_safe_cmp(a.as_bytes(), b.as_bytes())
-            }
-            (Either::B(a), Either::B(b)) => {
-                a.with_ref(|a| b.with_ref(|b| cmp::timing_safe_cmp(a, b)))
+                constant_time_eq(a.as_bytes(), b.as_bytes())
             }
+            (Either::B(a), Either::B(b)) => a.with_ref(|a| b.with_ref(|b| constant_time_eq(a, b))),
             _ => {
                 return Err(vm.new_type_error(
                     "unsupported operand types(s) or combination of types".to_owned(),
