min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use prefix BORING_BSSL_ for all boringssl env variables 

This means BORING_SSL_PRECOMPILED_BCM_O is now
BORING_BSSL_PRECOMPILED_BCM_O.

Prefix BORING_BSSL_ has been chosen because that's the
one that is used the most among all the variables
the build script uses.
This commit is contained in:
Anthony Ramine 2023-10-10 11:57:56 +02:00 committed by Anthony Ramine
parent ebea825d18
commit bc095478fc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boring-sys/build/config.rs
View File

@ -112,7 +112,7 @@ impl Env {
path: var("BORING_BSSL_PATH").map(Into::into), path: var("BORING_BSSL_PATH").map(Into::into),
include_path: var("BORING_BSSL_INCLUDE_PATH").map(Into::into), include_path: var("BORING_BSSL_INCLUDE_PATH").map(Into::into),
source_path: var("BORING_BSSL_SOURCE_PATH").map(Into::into), source_path: var("BORING_BSSL_SOURCE_PATH").map(Into::into),
precompiled_bcm_o: var("BORING_SSL_PRECOMPILED_BCM_O").map(Into::into), precompiled_bcm_o: var("BORING_BSSL_PRECOMPILED_BCM_O").map(Into::into),
debug: var("DEBUG"), debug: var("DEBUG"),
opt_level: var("OPT_LEVEL"), opt_level: var("OPT_LEVEL"),
android_ndk_home: var("ANDROID_NDK_HOME").map(Into::into), android_ndk_home: var("ANDROID_NDK_HOME").map(Into::into),

2
boring-sys/build/main.rs
View File

@ -529,7 +529,7 @@ fn link_in_precompiled_bcm_o(config: &Config) {
let bssl_dir = built_boring_source_path(config); let bssl_dir = built_boring_source_path(config);
let bcm_o_src_path = config.env.precompiled_bcm_o.as_ref() let bcm_o_src_path = config.env.precompiled_bcm_o.as_ref()
.expect("`fips-link-precompiled` requires `BORING_SSL_PRECOMPILED_BCM_O` env variable to be specified"); .expect("`fips-link-precompiled` requires `BORING_BSSL_PRECOMPILED_BCM_O` env variable to be specified");
let libcrypto_path = bssl_dir let libcrypto_path = bssl_dir
.join("build/crypto/libcrypto.a") .join("build/crypto/libcrypto.a")

2
boring/src/lib.rs
View File

@ -46,7 +46,7 @@
//! ## Linking current BoringSSL version with precompiled FIPS-validated module (`bcm.o`) //! ## Linking current BoringSSL version with precompiled FIPS-validated module (`bcm.o`)
//! It's possible to link latest supported version of BoringSSL with FIPS-validated crypto module //! It's possible to link latest supported version of BoringSSL with FIPS-validated crypto module
//! (`bcm.o`). To enable this compilation option one should enable `fips-link-precompiled` //! (`bcm.o`). To enable this compilation option one should enable `fips-link-precompiled`
//! compilation feature and provide a `BORING_SSL_PRECOMPILED_BCM_O` env variable with a path to the //! compilation feature and provide a `BORING_BSSL_PRECOMPILED_BCM_O` env variable with a path to the
//! precompiled FIPS-validated `bcm.o` module. //! precompiled FIPS-validated `bcm.o` module.
//! //!
//! # Optional patches //! # Optional patches