Skip to content

Commit

Permalink
Migrate rsa to declarative modules API
Browse files Browse the repository at this point in the history
refs #11158
  • Loading branch information
alex committed Jul 9, 2024
1 parent 67a5215 commit a3db9eb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 14 deletions.
1 change: 0 additions & 1 deletion src/rust/src/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ pub(crate) fn add_to_module(module: &pyo3::Bound<'_, pyo3::types::PyModule>) ->
module.add_submodule(&hashes::create_module(module.py())?)?;
module.add_submodule(&hmac::create_module(module.py())?)?;
module.add_submodule(&kdf::create_module(module.py())?)?;
module.add_submodule(&rsa::create_module(module.py())?)?;

Ok(())
}
20 changes: 7 additions & 13 deletions src/rust/src/backend/rsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::backend::{hashes, utils};
use crate::buf::CffiBuf;
use crate::error::{CryptographyError, CryptographyResult};
use crate::{exceptions, types};
use pyo3::types::{PyAnyMethods, PyModuleMethods};
use pyo3::types::PyAnyMethods;

#[pyo3::pyclass(
frozen,
Expand Down Expand Up @@ -814,16 +814,10 @@ impl RsaPublicNumbers {
}
}

pub(crate) fn create_module(
py: pyo3::Python<'_>,
) -> pyo3::PyResult<pyo3::Bound<'_, pyo3::types::PyModule>> {
let m = pyo3::types::PyModule::new_bound(py, "rsa")?;
m.add_function(pyo3::wrap_pyfunction_bound!(generate_private_key, &m)?)?;

m.add_class::<RsaPrivateKey>()?;
m.add_class::<RsaPublicKey>()?;
m.add_class::<RsaPrivateNumbers>()?;
m.add_class::<RsaPublicNumbers>()?;

Ok(m)
#[pyo3::pymodule]
pub(crate) mod rsa {
#[pymodule_export]
use super::{
generate_private_key, RsaPrivateKey, RsaPrivateNumbers, RsaPublicKey, RsaPublicNumbers,
};
}
2 changes: 2 additions & 0 deletions src/rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ mod _rust {
#[pymodule_export]
use super::super::{is_fips_enabled, openssl_version, openssl_version_text};
#[pymodule_export]
use crate::backend::rsa::rsa;
#[pymodule_export]
use crate::error::{capture_error_stack, raise_openssl_error, OpenSSLError};

#[pymodule_init]
Expand Down

0 comments on commit a3db9eb

Please sign in to comment.