Skip to content

Commit 337325d

Browse files
committed
disable the conf module for LibreSSL 4
1 parent dbf2d68 commit 337325d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

openssl/build.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fn main() {
3131
println!("cargo:rustc-check-cfg=cfg(libressl380)");
3232
println!("cargo:rustc-check-cfg=cfg(libressl382)");
3333
println!("cargo:rustc-check-cfg=cfg(libressl390)");
34+
println!("cargo:rustc-check-cfg=cfg(libressl400)");
3435

3536
println!("cargo:rustc-check-cfg=cfg(ossl101)");
3637
println!("cargo:rustc-check-cfg=cfg(ossl102)");
@@ -112,6 +113,9 @@ fn main() {
112113
if version >= 0x3_09_00_00_0 {
113114
println!("cargo:rustc-cfg=libressl390");
114115
}
116+
if version >= 0x4_00_00_00_0 {
117+
println!("cargo:rustc-cfg=libressl400");
118+
}
115119
}
116120

117121
if let Ok(vars) = env::var("DEP_OPENSSL_CONF") {

openssl/src/conf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ foreign_type_and_impl_send_sync! {
88
pub struct ConfRef;
99
}
1010

11-
#[cfg(not(boringssl))]
11+
#[cfg(not(any(boringssl, libressl400)))]
1212
mod methods {
1313
use super::Conf;
1414
use crate::cvt_p;
@@ -61,5 +61,5 @@ mod methods {
6161
}
6262
}
6363
}
64-
#[cfg(not(boringssl))]
64+
#[cfg(not(any(boringssl, libressl400)))]
6565
pub use methods::*;

0 commit comments

Comments
 (0)