Skip to content

Commit 9ef1fe3

Browse files
authored
Merge pull request #1948 from alex/boringssl-warnings
Fix warnings from BoringSSL on Rust 1.70
2 parents 4b4a344 + 90d9199 commit 9ef1fe3

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

openssl-sys/build/run_bindgen.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,15 @@ pub fn run_boringssl(include_dirs: &[PathBuf]) {
110110
let mut builder = bindgen::builder()
111111
.rust_target(RustTarget::Stable_1_47)
112112
.ctypes_prefix("::libc")
113+
.raw_line("use libc::*;")
113114
.derive_default(false)
114115
.enable_function_attribute_detection()
115116
.default_macro_constant_type(MacroTypeVariation::Signed)
116117
.rustified_enum("point_conversion_form_t")
117118
.allowlist_file(".*/openssl/[^/]+\\.h")
119+
.allowlist_recursively(false)
120+
.blocklist_function("BIO_vsnprintf")
121+
.blocklist_function("OPENSSL_vasprintf")
118122
.wrap_static_fns(true)
119123
.wrap_static_fns_path(out_dir.join("boring_static_wrapper").display().to_string())
120124
.layout_tests(false)
@@ -165,11 +169,15 @@ pub fn run_boringssl(include_dirs: &[PathBuf]) {
165169
.arg(out_dir.join("bindgen.rs"))
166170
.arg("--rust-target=1.47")
167171
.arg("--ctypes-prefix=::libc")
172+
.arg("--raw-line=use libc::*;")
168173
.arg("--no-derive-default")
169174
.arg("--enable-function-attribute-detection")
170175
.arg("--default-macro-constant-type=signed")
171176
.arg("--rustified-enum=point_conversion_form_t")
172177
.arg("--allowlist-file=.*/openssl/[^/]+\\.h")
178+
.arg("--no-recursive-allowlist")
179+
.arg("--blocklist-function=BIO_vsnprintf")
180+
.arg("--blocklist-function=OPENSSL_vasprintf")
173181
.arg("--experimental")
174182
.arg("--wrap-static-fns")
175183
.arg("--wrap-static-fns-path")

openssl-sys/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
overflowing_literals,
1111
unused_imports
1212
)]
13+
#![cfg_attr(feature = "unstable_boringssl", allow(ambiguous_glob_reexports))]
1314
#![doc(html_root_url = "https://docs.rs/openssl-sys/0.9")]
1415
#![recursion_limit = "128"] // configure fixed limit across all rust versions
1516

0 commit comments

Comments
 (0)