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

Jump to bottom

Test against 3.2.0-alpha1 #2037

Merged
merged 2 commits into from Sep 8, 2023
Merged

Test against 3.2.0-alpha1 #2037

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
d27ab95
Test against 3.2.0-alpha1
sfackler Sep 8, 2023
efefb22
Fix const
sfackler Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -157,6 +157,9 @@ jobs:
version: bcecc7d834fc44ad257b2f23f88e1cf597ab2736
- name: openssl
version: vendored
- name: openssl
version: 3.2.0-alpha1
dl-path: /
- name: openssl
version: 3.1.2
dl-path: /
Expand Down
3 changes: 3 additions & 0 deletions openssl-sys/build/cfgs.rs
View file
Open in desktop
Expand Up @@ -59,6 +59,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
} else {
let openssl_version = openssl_version.unwrap();

if openssl_version >= 0x3_02_00_00_0 {
cfgs.push("ossl320");
}
if openssl_version >= 0x3_00_00_00_0 {
cfgs.push("ossl300");
}
Expand Down
10 changes: 9 additions & 1 deletion openssl-sys/src/x509v3.rs
View file
Open in desktop
Expand Up @@ -89,8 +89,16 @@ pub const X509_PURPOSE_CRL_SIGN: c_int = 6;
pub const X509_PURPOSE_ANY: c_int = 7;
pub const X509_PURPOSE_OCSP_HELPER: c_int = 8;
pub const X509_PURPOSE_TIMESTAMP_SIGN: c_int = 9;
#[cfg(ossl320)]
pub const X509_PURPOSE_CODE_SIGN: c_int = 10;
pub const X509_PURPOSE_MIN: c_int = 1;
pub const X509_PURPOSE_MAX: c_int = 9;
cfg_if! {
if #[cfg(ossl320)] {
pub const X509_PURPOSE_MAX: c_int = 10;
} else {
pub const X509_PURPOSE_MAX: c_int = 9;
}
}

pub const CRL_REASON_UNSPECIFIED: c_int = 0;
pub const CRL_REASON_KEY_COMPROMISE: c_int = 1;
Expand Down
3 changes: 3 additions & 0 deletions openssl/build.rs
View file
Open in desktop
Expand Up @@ -102,6 +102,9 @@ fn main() {
if version >= 0x3_01_00_00_0 {
println!("cargo:rustc-cfg=ossl310");
}
if version >= 0x3_02_00_00_0 {
println!("cargo:rustc-cfg=ossl320");
}
}

if let Ok(version) = env::var("DEP_OPENSSL_LIBRESSL_VERSION_NUMBER") {
Expand Down
2 changes: 2 additions & 0 deletions openssl/src/x509/mod.rs
View file
Open in desktop
Expand Up @@ -2459,6 +2459,8 @@ impl X509PurposeId {
pub const ANY: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_ANY);
pub const OCSP_HELPER: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_OCSP_HELPER);
pub const TIMESTAMP_SIGN: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_TIMESTAMP_SIGN);
#[cfg(ossl320)]
pub const CODE_SIGN: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_CODE_SIGN);

/// Constructs an `X509PurposeId` from a raw OpenSSL value.
pub fn from_raw(id: c_int) -> Self {
Expand Down