Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc oscp pyo3 migrations #10748

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Misc oscp pyo3 migrations #10748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12303b
Misc. migrations for `x509/ocsp*.rs` files to new pyo3 APIs
facutuesca Apr 5, 2024
c0258b9
Fix parameter to be Bound and run cargo fmt
facutuesca Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 60 additions & 58 deletions src/rust/src/pkcs7.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,71 +134,73 @@ fn sign_and_serialize<'p>(
.map(|p| p.raw.borrow_dependent())
.collect::<Vec<_>>();
for (cert, py_private_key, py_hash_alg, rsa_padding) in &py_signers {
let (authenticated_attrs, signature) = if options
.contains(types::PKCS7_NO_ATTRIBUTES.get(py)?)?
{
(
None,
x509::sign::sign_data(
let (authenticated_attrs, signature) =
if options.contains(types::PKCS7_NO_ATTRIBUTES.get(py)?)? {
(
None,
x509::sign::sign_data(
py,
py_private_key.as_borrowed().to_owned(),
py_hash_alg.as_borrowed().to_owned(),
rsa_padding.as_borrowed().to_owned(),
&data_with_header,
)?,
)
} else {
let mut authenticated_attrs = vec![
Attribute {
type_id: PKCS7_CONTENT_TYPE_OID,
values: common::Asn1ReadableOrWritable::new_write(asn1::SetOfWriter::new(
[asn1::parse_single(&content_type_bytes).unwrap()],
)),
},
Attribute {
type_id: PKCS7_SIGNING_TIME_OID,
values: common::Asn1ReadableOrWritable::new_write(asn1::SetOfWriter::new(
[asn1::parse_single(&signing_time_bytes).unwrap()],
)),
},
];

let digest = asn1::write_single(&x509::ocsp::hash_data(
py,
py_private_key.as_borrowed().to_owned(),
py_hash_alg.as_borrowed().to_owned(),
rsa_padding.as_borrowed().to_owned(),
&py_hash_alg.as_borrowed(),
&data_with_header,
)?,
)
} else {
let mut authenticated_attrs = vec![
Attribute {
type_id: PKCS7_CONTENT_TYPE_OID,
values: common::Asn1ReadableOrWritable::new_write(asn1::SetOfWriter::new([
asn1::parse_single(&content_type_bytes).unwrap(),
])),
},
Attribute {
type_id: PKCS7_SIGNING_TIME_OID,
values: common::Asn1ReadableOrWritable::new_write(asn1::SetOfWriter::new([
asn1::parse_single(&signing_time_bytes).unwrap(),
])),
},
];

let digest =
asn1::write_single(&x509::ocsp::hash_data(py, py_hash_alg, &data_with_header)?)?;
// Gross hack: copy to PyBytes to extend the lifetime to 'p
let digest_bytes = pyo3::types::PyBytes::new(py, &digest);
authenticated_attrs.push(Attribute {
type_id: PKCS7_MESSAGE_DIGEST_OID,
values: common::Asn1ReadableOrWritable::new_write(asn1::SetOfWriter::new([
asn1::parse_single(digest_bytes.as_bytes()).unwrap(),
])),
});

if !options.contains(types::PKCS7_NO_CAPABILITIES.get(py)?)? {
)?)?;
// Gross hack: copy to PyBytes to extend the lifetime to 'p
let digest_bytes = pyo3::types::PyBytes::new(py, &digest);
authenticated_attrs.push(Attribute {
type_id: PKCS7_SMIME_CAP_OID,
type_id: PKCS7_MESSAGE_DIGEST_OID,
values: common::Asn1ReadableOrWritable::new_write(asn1::SetOfWriter::new([
asn1::parse_single(&smime_cap_bytes).unwrap(),
asn1::parse_single(digest_bytes.as_bytes()).unwrap(),
])),
});
}

let signed_data =
asn1::write_single(&asn1::SetOfWriter::new(authenticated_attrs.as_slice()))?;

(
Some(common::Asn1ReadableOrWritable::new_write(
asn1::SetOfWriter::new(authenticated_attrs),
)),
x509::sign::sign_data(
py,
py_private_key.as_borrowed().to_owned(),
py_hash_alg.as_borrowed().to_owned(),
rsa_padding.as_borrowed().to_owned(),
&signed_data,
)?,
)
};
if !options.contains(types::PKCS7_NO_CAPABILITIES.get(py)?)? {
authenticated_attrs.push(Attribute {
type_id: PKCS7_SMIME_CAP_OID,
values: common::Asn1ReadableOrWritable::new_write(asn1::SetOfWriter::new(
[asn1::parse_single(&smime_cap_bytes).unwrap()],
)),
});
}

let signed_data =
asn1::write_single(&asn1::SetOfWriter::new(authenticated_attrs.as_slice()))?;

(
Some(common::Asn1ReadableOrWritable::new_write(
asn1::SetOfWriter::new(authenticated_attrs),
)),
x509::sign::sign_data(
py,
py_private_key.as_borrowed().to_owned(),
py_hash_alg.as_borrowed().to_owned(),
rsa_padding.as_borrowed().to_owned(),
&signed_data,
)?,
)
};

let digest_alg = x509::ocsp::HASH_NAME_TO_ALGORITHM_IDENTIFIERS[py_hash_alg
.getattr(pyo3::intern!(py, "name"))?
Expand Down
8 changes: 4 additions & 4 deletions src/rust/src/x509/ocsp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::collections::HashMap;
use cryptography_x509::common;
use cryptography_x509::ocsp_req::CertID;
use once_cell::sync::Lazy;
use pyo3::PyNativeType;
use pyo3::prelude::PyAnyMethods;

use crate::backend::hashes::Hash;
use crate::error::CryptographyResult;
Expand Down Expand Up @@ -76,7 +76,7 @@ pub(crate) fn certid_new<'p>(
py: pyo3::Python<'p>,
cert: &'p Certificate,
issuer: &'p Certificate,
hash_algorithm: &'p pyo3::PyAny,
hash_algorithm: &pyo3::Bound<'p, pyo3::PyAny>,
) -> CryptographyResult<CertID<'p>> {
let issuer_der = asn1::write_single(&cert.raw.borrow_dependent().tbs_cert.issuer)?;
let issuer_name_hash = hash_data(py, hash_algorithm, &issuer_der)?;
Expand Down Expand Up @@ -123,10 +123,10 @@ pub(crate) fn certid_new_from_hash<'p>(

pub(crate) fn hash_data<'p>(
py: pyo3::Python<'p>,
py_hash_alg: &'p pyo3::PyAny,
py_hash_alg: &pyo3::Bound<'p, pyo3::PyAny>,
data: &[u8],
) -> pyo3::PyResult<&'p [u8]> {
let mut h = Hash::new(py, &py_hash_alg.as_borrowed(), None)?;
let mut h = Hash::new(py, py_hash_alg, None)?;
h.update_bytes(data)?;
Ok(h.finalize(py)?.into_gil_ref().as_bytes())
}
3 changes: 2 additions & 1 deletion src/rust/src/x509/ocsp_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use cryptography_x509::{
oid,
};
use pyo3::prelude::{PyAnyMethods, PyListMethods, PyModuleMethods};
use pyo3::PyNativeType;

use crate::asn1::{big_byte_slice_to_py_int, oid_to_py_oid, py_uint_to_big_endian_bytes};
use crate::error::{CryptographyError, CryptographyResult};
Expand Down Expand Up @@ -187,7 +188,7 @@ fn create_ocsp_request(
py_cert = tuple.0;
py_issuer = tuple.1;
py_hash = tuple.2;
ocsp::certid_new(py, &py_cert, &py_issuer, py_hash)?
ocsp::certid_new(py, &py_cert, &py_issuer, &py_hash.as_borrowed())?
} else {
let (issuer_name_hash, issuer_key_hash, py_serial, py_hash): (
&[u8],
Expand Down
20 changes: 11 additions & 9 deletions src/rust/src/x509/ocsp_resp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use cryptography_x509::{
oid,
};
use pyo3::prelude::{PyAnyMethods, PyListMethods, PyModuleMethods};
use pyo3::PyNativeType;

use crate::asn1::{big_byte_slice_to_py_int, oid_to_py_oid};
use crate::error::{CryptographyError, CryptographyResult};
Expand Down Expand Up @@ -578,10 +577,10 @@ fn singleresp_py_revocation_time<'p>(
#[pyo3::prelude::pyfunction]
fn create_ocsp_response(
py: pyo3::Python<'_>,
status: &pyo3::PyAny,
builder: &pyo3::PyAny,
private_key: &pyo3::PyAny,
hash_algorithm: &pyo3::PyAny,
status: &pyo3::Bound<'_, pyo3::PyAny>,
builder: &pyo3::Bound<'_, pyo3::PyAny>,
private_key: &pyo3::Bound<'_, pyo3::PyAny>,
hash_algorithm: &pyo3::Bound<'_, pyo3::PyAny>,
) -> CryptographyResult<OCSPResponse> {
let response_status = status
.getattr(pyo3::intern!(py, "value"))?
Expand Down Expand Up @@ -656,7 +655,7 @@ fn create_ocsp_response(
)?)?;

let responses = vec![SingleResponse {
cert_id: ocsp::certid_new(py, &py_cert, &py_issuer, py_cert_hash_algorithm)?,
cert_id: ocsp::certid_new(py, &py_cert, &py_issuer, &py_cert_hash_algorithm)?,
cert_status,
next_update,
this_update,
Expand All @@ -665,10 +664,10 @@ fn create_ocsp_response(

borrowed_cert = responder_cert.borrow();
let responder_id = if responder_encoding.is(types::OCSP_RESPONDER_ENCODING_HASH.get(py)?) {
let sha1 = types::SHA1.get(py)?.call0()?;
let sha1 = types::SHA1.get_bound(py)?.call0()?;
ocsp_resp::ResponderId::ByKey(ocsp::hash_data(
py,
sha1,
&sha1,
borrowed_cert
.raw
.borrow_dependent()
Expand Down Expand Up @@ -697,7 +696,10 @@ fn create_ocsp_response(
)),
raw_response_extensions: x509::common::encode_extensions(
py,
builder.getattr(pyo3::intern!(py, "_extensions"))?,
builder
.getattr(pyo3::intern!(py, "_extensions"))?
.clone()
.into_gil_ref(),
extensions::encode_extension,
)?,
};
Expand Down