diff --git a/Cargo.lock b/Cargo.lock index 313da258..6ed5dfcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -277,8 +277,6 @@ dependencies = [ "lenient_semver", "log", "mockito", - "openssl", - "openssl-probe", "quick-xml", "regex", "reqwest", diff --git a/cpp-linter/Cargo.toml b/cpp-linter/Cargo.toml index ba14853b..ced4a4ab 100644 --- a/cpp-linter/Cargo.toml +++ b/cpp-linter/Cargo.toml @@ -23,8 +23,6 @@ futures = "0.3.31" git2 = "0.20.2" lenient_semver = "0.4.2" log = { version = "0.4.28", features = ["std"] } -openssl = { version = "0.10", features = ["vendored"], optional = true } -openssl-probe = { version = "0.1", optional = true } quick-xml = { version = "0.38.3", features = ["serialize"] } regex = "1.11.2" reqwest = "0.12.23" @@ -39,9 +37,10 @@ which = "8.0.0" [dev-dependencies] mockito = "1.7.0" tempfile = "3.22.0" +git2 = { version = "0.20.2", features = ["https"]} [features] -openssl-vendored = ["dep:openssl", "dep:openssl-probe"] +openssl-vendored = ["git2/vendored-openssl"] [lib] bench = false diff --git a/cpp-linter/src/run.rs b/cpp-linter/src/run.rs index 13456d40..e3bf6898 100644 --- a/cpp-linter/src/run.rs +++ b/cpp-linter/src/run.rs @@ -10,8 +10,6 @@ use std::sync::{Arc, Mutex}; // non-std crates use anyhow::{anyhow, Result}; use log::{set_max_level, LevelFilter}; -#[cfg(feature = "openssl-vendored")] -use openssl_probe; // project specific modules/crates use crate::clang_tools::capture_clang_tools_output; @@ -22,13 +20,6 @@ use crate::rest_api::{github::GithubApiClient, RestApiClient}; const VERSION: &str = env!("CARGO_PKG_VERSION"); -fn probe_ssl_certs() { - #[cfg(feature = "openssl-vendored")] - unsafe { - openssl_probe::init_openssl_env_vars(); - } -} - /// This is the backend entry point for console applications. /// /// The idea here is that all functionality is implemented in Rust. However, passing @@ -49,8 +40,6 @@ fn probe_ssl_certs() { /// alias ("path/to/cpp-linter.exe"). Thus, the parser in [`crate::cli`] will halt on an error /// because it is not configured to handle positional arguments. pub async fn run_main(args: Vec) -> Result<()> { - probe_ssl_certs(); - let arg_parser = get_arg_parser(); let args = arg_parser.get_matches_from(args); let cli = Cli::from(&args);