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

Use X509_PURPOSE_get_id instead of struct access #2115

Merged
merged 2 commits into from
Dec 2, 2023
Merged

Use X509_PURPOSE_get_id instead of struct access #2115

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
25606f0
Use X509_PURPOSE_get_id instead of struct access
davidben Dec 2, 2023
9cafc73
Restore struct in handwritten, memory-unsafe bindings
davidben Dec 2, 2023
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
1 change: 1 addition & 0 deletions openssl-sys/src/handwritten/x509.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,7 @@ pub struct X509_PURPOSE {
const_ptr_api! {
extern "C" {
pub fn X509_PURPOSE_get_by_sname(sname: #[const_ptr_if(any(ossl110, libressl280))] c_char) -> c_int;
pub fn X509_PURPOSE_get_id(purpose: #[const_ptr_if(any(ossl110, libressl280))] X509_PURPOSE) -> c_int;
}
}
extern "C" {
Expand Down
12 changes: 9 additions & 3 deletions openssl/src/x509/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2538,7 +2538,7 @@ impl X509PurposeRef {
unsafe {
let sname = CString::new(sname).unwrap();
cfg_if! {
if #[cfg(any(ossl110, libressl280))] {
if #[cfg(any(ossl110, libressl280, boringssl))] {
let purpose = cvt_n(ffi::X509_PURPOSE_get_by_sname(sname.as_ptr() as *const _))?;
} else {
let purpose = cvt_n(ffi::X509_PURPOSE_get_by_sname(sname.as_ptr() as *mut _))?;
Expand Down Expand Up @@ -2569,8 +2569,14 @@ impl X509PurposeRef {
/// - `X509_PURPOSE_TIMESTAMP_SIGN`
pub fn purpose(&self) -> X509PurposeId {
unsafe {
let x509_purpose: *mut ffi::X509_PURPOSE = self.as_ptr();
X509PurposeId::from_raw((*x509_purpose).purpose)
cfg_if! {
if #[cfg(any(ossl110, libressl280, boringssl))] {
let x509_purpose = self.as_ptr() as *const ffi::X509_PURPOSE;
} else {
let x509_purpose = self.as_ptr() as *mut ffi::X509_PURPOSE;
}
}
X509PurposeId::from_raw(ffi::X509_PURPOSE_get_id(x509_purpose))
}
}
}