saymrwulf/cryptography
1
0
Fork 0
mirror of https://github.com/saymrwulf/cryptography.git synced 2026-05-14 20:37:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: replace returning pyobject with bound<'p, pyany> in backend::ciphers (#11981)

Browse source 
Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
This commit is contained in:
Oleg Höfling 2024-11-17 01:26:24 +01:00 committed by GitHub
parent e0ebc427a7
commit 974a5bd865
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/rust/src/backend/ciphers.rs
View file

@ -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())
}
}