Skip to content

feat: delegate vendoring of OpenSSL to git2 dependency tree #200

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

Merged
merged 1 commit into from
Oct 20, 2025
Merged

feat: delegate vendoring of OpenSSL to git2 dependency tree #200

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: 0 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions cpp-linter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
11 changes: 0 additions & 11 deletions cpp-linter/src/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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<String>) -> Result<()> {
probe_ssl_certs();

let arg_parser = get_arg_parser();
let args = arg_parser.get_matches_from(args);
let cli = Cli::from(&args);
Expand Down
Loading