Skip to content

Unify the two BoringSSL codepaths a bit and simplify init #2377

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
Mar 3, 2025
Merged

Unify the two BoringSSL codepaths a bit and simplify init #2377

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
17 changes: 7 additions & 10 deletions openssl-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
non_upper_case_globals,
unused_imports
)]
#![cfg_attr(feature = "unstable_boringssl", allow(ambiguous_glob_reexports))]
#![doc(html_root_url = "https://docs.rs/openssl-sys/0.9")]
#![recursion_limit = "128"] // configure fixed limit across all rust versions

Expand All @@ -15,21 +14,19 @@ pub use libc::c_int;

#[cfg(feature = "unstable_boringssl")]
extern crate bssl_sys;
#[cfg(feature = "unstable_boringssl")]
pub use bssl_sys::*;

#[cfg(all(boringssl, not(feature = "unstable_boringssl")))]
#[cfg(boringssl)]
#[path = "."]
mod boringssl {
#[cfg(feature = "unstable_boringssl")]
pub use bssl_sys::*;
#[cfg(not(feature = "unstable_boringssl"))]
include!(concat!(env!("OUT_DIR"), "/bindgen.rs"));

pub fn init() {
unsafe {
CRYPTO_library_init();
}
}
// BoringSSL does not require initialization.
pub fn init() {}
}
#[cfg(all(boringssl, not(feature = "unstable_boringssl")))]
#[cfg(boringssl)]
pub use boringssl::*;

#[cfg(openssl)]
Expand Down