Skip to content

Add a feature flag for forcing selection of openssl #291

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a feature flag for forcing selection of openssl #291

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
1ea1751
wip
eranrund Feb 26, 2024
8d791e0
cleanup
eranrund Feb 26, 2024
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
8 changes: 8 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
vendored = ["openssl/vendored"]
alpn = ["security-framework/alpn"]
force-openssl = ["openssl", "openssl-sys", "openssl-probe", "log"]

[target.'cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos", target_os = "tvos"))'.dependencies]
security-framework = "2.0.0"
Expand All @@ -31,6 +32,13 @@ openssl = "0.10.29"
openssl-sys = "0.9.55"
openssl-probe = "0.1"

# Used when the force-openssl feature is enabled.
[dependencies]
log = { version = "0.4.5", optional = true }
openssl = { version = "0.10.29", optional = true }
openssl-sys = { version = "0.9.55", optional = true }
openssl-probe = { version = "0.1", optional = true }

[dev-dependencies]
tempfile = "3.0"
test-cert-gen = "0.9"
12 changes: 6 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,33 +104,33 @@ use std::fmt;
use std::io;
use std::result;

#[cfg(not(any(
#[cfg(any(feature = "force-openssl", not(any(
target_os = "macos",
target_os = "windows",
target_os = "ios",
target_os = "watchos",
target_os = "tvos"
)))]
))))]
#[macro_use]
extern crate log;
#[cfg(any(
#[cfg(all(not(feature = "force-openssl"), any(
target_os = "macos",
target_os = "ios",
target_os = "watchos",
target_os = "tvos"
))]
)))]
#[path = "imp/security_framework.rs"]
mod imp;
#[cfg(target_os = "windows")]
#[path = "imp/schannel.rs"]
mod imp;
#[cfg(not(any(
#[cfg(any(feature = "force-openssl", not(any(
target_os = "macos",
target_os = "windows",
target_os = "ios",
target_os = "watchos",
target_os = "tvos"
)))]
))))]
#[path = "imp/openssl.rs"]
mod imp;

Expand Down