Skip to content

Commit efefb22

Browse files
committed
Fix const
1 parent d27ab95 commit efefb22

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

openssl-sys/build/cfgs.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
5959
} else {
6060
let openssl_version = openssl_version.unwrap();
6161

62+
if openssl_version >= 0x3_02_00_00_0 {
63+
cfgs.push("ossl320");
64+
}
6265
if openssl_version >= 0x3_00_00_00_0 {
6366
cfgs.push("ossl300");
6467
}

openssl-sys/src/x509v3.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,16 @@ pub const X509_PURPOSE_CRL_SIGN: c_int = 6;
8989
pub const X509_PURPOSE_ANY: c_int = 7;
9090
pub const X509_PURPOSE_OCSP_HELPER: c_int = 8;
9191
pub const X509_PURPOSE_TIMESTAMP_SIGN: c_int = 9;
92+
#[cfg(ossl320)]
93+
pub const X509_PURPOSE_CODE_SIGN: c_int = 10;
9294
pub const X509_PURPOSE_MIN: c_int = 1;
93-
pub const X509_PURPOSE_MAX: c_int = 9;
95+
cfg_if! {
96+
if #[cfg(ossl320)] {
97+
pub const X509_PURPOSE_MAX: c_int = 10;
98+
} else {
99+
pub const X509_PURPOSE_MAX: c_int = 9;
100+
}
101+
}
94102

95103
pub const CRL_REASON_UNSPECIFIED: c_int = 0;
96104
pub const CRL_REASON_KEY_COMPROMISE: c_int = 1;

openssl/build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ fn main() {
102102
if version >= 0x3_01_00_00_0 {
103103
println!("cargo:rustc-cfg=ossl310");
104104
}
105+
if version >= 0x3_02_00_00_0 {
106+
println!("cargo:rustc-cfg=ossl320");
107+
}
105108
}
106109

107110
if let Ok(version) = env::var("DEP_OPENSSL_LIBRESSL_VERSION_NUMBER") {

openssl/src/x509/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2459,6 +2459,8 @@ impl X509PurposeId {
24592459
pub const ANY: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_ANY);
24602460
pub const OCSP_HELPER: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_OCSP_HELPER);
24612461
pub const TIMESTAMP_SIGN: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_TIMESTAMP_SIGN);
2462+
#[cfg(ossl320)]
2463+
pub const CODE_SIGN: X509PurposeId = X509PurposeId(ffi::X509_PURPOSE_CODE_SIGN);
24622464

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

0 commit comments

Comments
 (0)