refactor: replace returning pyobject with bound<'p, pyany> in backend…

…::ciphers (#11981) Signed-off-by: oleg.hoefling <[email protected]>
pyca · Nov 17, 2024 · 974a5bd · 974a5bd
1 parent e0ebc42
commit 974a5bd
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/rust/src/backend/ciphers.rs b/src/rust/src/backend/ciphers.rs
@@ -520,11 +520,11 @@ impl PyAEADDecryptionContext {
 }
 
 #[pyo3::pyfunction]
-fn create_encryption_ctx(
-    py: pyo3::Python<'_>,
+fn create_encryption_ctx<'p>(
+    py: pyo3::Python<'p>,
     algorithm: pyo3::Bound<'_, pyo3::PyAny>,
     mode: pyo3::Bound<'_, pyo3::PyAny>,
-) -> CryptographyResult<pyo3::PyObject> {
+) -> CryptographyResult<pyo3::Bound<'p, pyo3::PyAny>> {
     let ctx = CipherContext::new(py, algorithm, mode.clone(), openssl::symm::Mode::Encrypt)?;
 
     if mode.is_instance(&types::MODE_WITH_AUTHENTICATION_TAG.get(py)?)? {
@@ -540,22 +540,20 @@ fn create_encryption_ctx(
                 .extract()?,
         }
         .into_pyobject(py)?
-        .into_any()
-        .unbind())
+        .into_any())
     } else {
         Ok(PyCipherContext { ctx: Some(ctx) }
             .into_pyobject(py)?
-            .into_any()
-            .unbind())
+            .into_any())
     }
 }
 
 #[pyo3::pyfunction]
-fn create_decryption_ctx(
-    py: pyo3::Python<'_>,
+fn create_decryption_ctx<'p>(
+    py: pyo3::Python<'p>,
     algorithm: pyo3::Bound<'_, pyo3::PyAny>,
     mode: pyo3::Bound<'_, pyo3::PyAny>,
-) -> CryptographyResult<pyo3::PyObject> {
+) -> CryptographyResult<pyo3::Bound<'p, pyo3::PyAny>> {
     let mut ctx = CipherContext::new(py, algorithm, mode.clone(), openssl::symm::Mode::Decrypt)?;
 
     if mode.is_instance(&types::MODE_WITH_AUTHENTICATION_TAG.get(py)?)? {
@@ -577,13 +575,11 @@ fn create_decryption_ctx(
                 .extract()?,
         }
         .into_pyobject(py)?
-        .into_any()
-        .unbind())
+        .into_any())
     } else {
         Ok(PyCipherContext { ctx: Some(ctx) }
             .into_pyobject(py)?
-            .into_any()
-            .unbind())
+            .into_any())
     }
 }