Skip to content

Commit

Permalink
refactor: replace returning pyobject with bound<'p, pyany> in backend…
Browse files Browse the repository at this point in the history 
…::keys (#11983)

Signed-off-by: oleg.hoefling <[email protected]>
  • Loading branch information
@hoefling
hoefling authored Nov 17, 2024
1 parent 74f2621 commit 45409f7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 31 deletions.
46 changes: 18 additions & 28 deletions src/rust/src/backend/keys.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ use crate::exceptions;

#[pyo3::pyfunction]
#[pyo3(signature = (data, password, backend=None, *, unsafe_skip_rsa_key_validation=false))]
fn load_der_private_key(
py: pyo3::Python<'_>,
fn load_der_private_key<'p>(
py: pyo3::Python<'p>,
data: CffiBuf<'_>,
password: Option<CffiBuf<'_>>,
backend: Option<pyo3::Bound<'_, pyo3::PyAny>>,
unsafe_skip_rsa_key_validation: bool,
) -> CryptographyResult<pyo3::PyObject> {
) -> CryptographyResult<pyo3::Bound<'p, pyo3::PyAny>> {
let _ = backend;
if let Ok(pkey) = openssl::pkey::PKey::private_key_from_der(data.as_bytes()) {
if password.is_some() {
Expand All @@ -42,13 +42,13 @@ fn load_der_private_key(

#[pyo3::pyfunction]
#[pyo3(signature = (data, password, backend=None, *, unsafe_skip_rsa_key_validation=false))]
fn load_pem_private_key(
py: pyo3::Python<'_>,
fn load_pem_private_key<'p>(
py: pyo3::Python<'p>,
data: CffiBuf<'_>,
password: Option<CffiBuf<'_>>,
backend: Option<pyo3::Bound<'_, pyo3::PyAny>>,
unsafe_skip_rsa_key_validation: bool,
) -> CryptographyResult<pyo3::PyObject> {
) -> CryptographyResult<pyo3::Bound<'p, pyo3::PyAny>> {
let _ = backend;
let password = password.as_ref().map(CffiBuf::as_bytes);
let mut status = utils::PasswordCallbackStatus::Unused;
Expand All @@ -60,18 +60,17 @@ fn load_pem_private_key(
private_key_from_pkey(py, &pkey, unsafe_skip_rsa_key_validation)
}

pub(crate) fn private_key_from_pkey(
py: pyo3::Python<'_>,
pub(crate) fn private_key_from_pkey<'p>(
py: pyo3::Python<'p>,
pkey: &openssl::pkey::PKeyRef<openssl::pkey::Private>,
unsafe_skip_rsa_key_validation: bool,
) -> CryptographyResult<pyo3::PyObject> {
) -> CryptographyResult<pyo3::Bound<'p, pyo3::PyAny>> {
match pkey.id() {
openssl::pkey::Id::RSA => Ok(crate::backend::rsa::private_key_from_pkey(
pkey,
unsafe_skip_rsa_key_validation,
)?
.into_pyobject(py)?
.unbind()
.into_any()),
openssl::pkey::Id::RSA_PSS => {
// At the moment the way we handle RSA PSS keys is to strip the
Expand All @@ -84,49 +83,40 @@ pub(crate) fn private_key_from_pkey(
Ok(
crate::backend::rsa::private_key_from_pkey(&pkey, unsafe_skip_rsa_key_validation)?
.into_pyobject(py)?
.into_any()
.unbind(),
.into_any(),
)
}
openssl::pkey::Id::EC => Ok(crate::backend::ec::private_key_from_pkey(py, pkey)?
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),
openssl::pkey::Id::X25519 => Ok(crate::backend::x25519::private_key_from_pkey(pkey)
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),

#[cfg(all(not(CRYPTOGRAPHY_IS_LIBRESSL), not(CRYPTOGRAPHY_IS_BORINGSSL)))]
openssl::pkey::Id::X448 => Ok(crate::backend::x448::private_key_from_pkey(pkey)
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),

openssl::pkey::Id::ED25519 => Ok(crate::backend::ed25519::private_key_from_pkey(pkey)
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),

#[cfg(all(not(CRYPTOGRAPHY_IS_LIBRESSL), not(CRYPTOGRAPHY_IS_BORINGSSL)))]
openssl::pkey::Id::ED448 => Ok(crate::backend::ed448::private_key_from_pkey(pkey)
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),
openssl::pkey::Id::DSA => Ok(crate::backend::dsa::private_key_from_pkey(pkey)
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),
openssl::pkey::Id::DH => Ok(crate::backend::dh::private_key_from_pkey(pkey)
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),

#[cfg(all(not(CRYPTOGRAPHY_IS_LIBRESSL), not(CRYPTOGRAPHY_IS_BORINGSSL)))]
openssl::pkey::Id::DHX => Ok(crate::backend::dh::private_key_from_pkey(pkey)
.into_pyobject(py)?
.into_any()
.unbind()),
.into_any()),
_ => Err(CryptographyError::from(
exceptions::UnsupportedAlgorithm::new_err("Unsupported key type."),
)),
Expand Down
6 changes: 3 additions & 3 deletions src/rust/src/pkcs12.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ fn load_key_and_certificates<'p>(
password: Option<CffiBuf<'_>>,
backend: Option<pyo3::Bound<'_, pyo3::PyAny>>,
) -> CryptographyResult<(
pyo3::PyObject,
pyo3::Bound<'p, pyo3::PyAny>,
Option<x509::certificate::Certificate>,
pyo3::Bound<'p, pyo3::types::PyList>,
)> {
Expand All @@ -761,7 +761,7 @@ fn load_key_and_certificates<'p>(
let private_key = if let Some(pkey) = p12.pkey {
keys::private_key_from_pkey(py, &pkey, false)?
} else {
py.None()
py.None().into_bound(py)
};
let cert = if let Some(ossl_cert) = p12.cert {
let cert_der = pyo3::types::PyBytes::new(py, &ossl_cert.to_der()?).unbind();
Expand Down Expand Up @@ -808,7 +808,7 @@ fn load_pkcs12<'p>(
let private_key = if let Some(pkey) = p12.pkey {
keys::private_key_from_pkey(py, &pkey, false)?
} else {
py.None()
py.None().into_bound(py)
};
let cert = if let Some(ossl_cert) = p12.cert {
let cert_der = pyo3::types::PyBytes::new(py, &ossl_cert.to_der()?).unbind();
Expand Down

0 comments on commit 45409f7

Please sign in to comment.