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

Default enable DSO API to support FIPS module #251

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Default enable DSO API to support FIPS module #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ seed = []
force-engine = []
# Enable kTLS support
ktls = []
# Disable DSO API support
no-dso = []

[workspace]
members = ['testcrate']
Expand Down
10 changes: 9 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ impl Build {

configure
// No shared objects, we just want static libraries
.arg("no-dso")
.arg("no-shared")
// Should be off by default on OpenSSL 1.1.0, but let's be extra sure
.arg("no-ssl3")
Expand All @@ -191,6 +190,15 @@ impl Build {
// Avoid multilib-postfix for build targets that specify it
.arg("--libdir=lib");

if cfg!(feature = "no-dso") {
// engine requires DSO support
if cfg!(feature = "force-engine") {
println!("Feature 'force-engine' requires DSO, ignoring 'no-dso' feature.");
} else {
configure.arg("no-dso");
}
}

if cfg!(not(feature = "legacy")) {
configure.arg("no-legacy");
}
Expand Down