diff options
author | Paul Crowley <paulcrowley@google.com> | 2022-05-16 21:46:39 +0000 |
---|---|---|
committer | Pete Bentley <prb@google.com> | 2022-10-04 23:09:34 +0100 |
commit | b034aa0d4ed11513326083a3496add8a37ab987c (patch) | |
tree | 2bf2e06d66d41b9ece42e0c23d3178cf5e90b5e1 | |
parent | 41f4133e1638629f03097fa20dae67eec8639ee1 (diff) | |
download | boringssl-b034aa0d4ed11513326083a3496add8a37ab987c.tar.gz |
Allow prng_seeder utility
Give //system/security/prng_seeder access to ctrdrbg.h
Bug: 243933553
Test: Started under init and verified correct operation using strace
Change-Id: If18124d50d97d93541e5c040b506484a48ee40ac
Merged-In: If18124d50d97d93541e5c040b506484a48ee40ac
(cherry picked from commit 4ea336a10142019b185fffd2f800fb02e5f2d46e)
-rw-r--r-- | Android.bp | 10 | ||||
-rw-r--r-- | src/rust/wrapper.h | 1 |
2 files changed, 9 insertions, 2 deletions
@@ -617,8 +617,14 @@ rust_library { name: "libbssl_ffi", host_supported: true, crate_name: "bssl_ffi", - visibility: ["//external/rust/crates/openssl"], - srcs: ["src/rust/src/lib.rs"], + visibility: [ + "//external/rust/crates/openssl", + "//system/keymint/boringssl", + "//system/security/prng_seeder", + ], + // Use the modified source with placeholder replaced. + srcs: [":libbssl_sys_src"], + vendor_available: true, // Since libbssl_sys_raw is not publically visible, we can't // accidentally force a double-link by linking statically, so do so. rlibs: ["libbssl_sys_raw"], diff --git a/src/rust/wrapper.h b/src/rust/wrapper.h index aa5aeedb..ff466423 100644 --- a/src/rust/wrapper.h +++ b/src/rust/wrapper.h @@ -18,6 +18,7 @@ #include "../include/openssl/conf.h" #include "../include/openssl/cpu.h" #include "../include/openssl/crypto.h" +#include "../include/openssl/ctrdrbg.h" #include "../include/openssl/curve25519.h" #include "../include/openssl/des.h" #include "../include/openssl/dh.h" |