Use native binop methods instead of weird calls (#10716)

pyca · Apr 5, 2024 · c913f88 · c913f88
1 parent 166d21a
commit c913f88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/src/rust/src/backend/dsa.rs b/src/rust/src/backend/dsa.rs
@@ -295,15 +295,10 @@ fn check_dsa_private_numbers(
         ));
     }
 
-    if numbers
-        .public_numbers
-        .get()
-        .y
-        .as_ref(py)
-        .ne(params.g.as_ref(py).call_method1(
-            pyo3::intern!(py, "__pow__"),
-            (numbers.x.as_ref(py), params.p.as_ref(py)),
-        )?)?
+    if numbers.public_numbers.get().y.as_ref(py).ne(params
+        .g
+        .bind(py)
+        .pow(numbers.x.as_ref(py), Some(params.p.as_ref(py)))?)?
     {
         return Err(CryptographyError::from(
             pyo3::exceptions::PyValueError::new_err("y must be equal to (g ** x % p)."),

diff --git a/src/rust/src/backend/rsa.rs b/src/rust/src/backend/rsa.rs
@@ -636,26 +636,25 @@ fn check_private_key_components(
         ));
     }
 
-    // No `bitand` method.
-    if public_exponent.call_method1("__and__", (1,))?.eq(0)? {
+    if public_exponent.bitand(1)?.eq(0)? {
         return Err(CryptographyError::from(
             pyo3::exceptions::PyValueError::new_err("public_exponent must be odd."),
         ));
     }
 
-    if dmp1.call_method1("__and__", (1,))?.eq(0)? {
+    if dmp1.bitand(1)?.eq(0)? {
         return Err(CryptographyError::from(
             pyo3::exceptions::PyValueError::new_err("dmp1 must be odd."),
         ));
     }
 
-    if dmq1.call_method1("__and__", (1,))?.eq(0)? {
+    if dmq1.bitand(1)?.eq(0)? {
         return Err(CryptographyError::from(
             pyo3::exceptions::PyValueError::new_err("dmq1 must be odd."),
         ));
     }
 
-    if p.call_method1("__mul__", (q,))?.ne(modulus)? {
+    if p.mul(q)?.ne(modulus)? {
         return Err(CryptographyError::from(
             pyo3::exceptions::PyValueError::new_err("p*q must equal modulus."),
         ));
@@ -771,8 +770,7 @@ fn check_public_key_components(
         ));
     }
 
-    // No `bitand` method.
-    if e.call_method1("__and__", (1,))?.eq(0)? {
+    if e.bitand(1)?.eq(0)? {
         return Err(CryptographyError::from(
             pyo3::exceptions::PyValueError::new_err("e must be odd."),
         ));