From 04137372dcfe0d7eba8545efd65b7f43b682bb71 Mon Sep 17 00:00:00 2001 From: Ayrton Munoz Date: Wed, 3 Aug 2022 17:05:09 -0400 Subject: libbinder: Remove dependency on openssl for Trusty kernel This modifies the trusty-specific OS.cpp to use the RNG available in the trusty kernel instead of openssl when TRUSTY_KERNEL_FD is defined. Bug: 230134581 Test: build Trusty Change-Id: Ic27406707a515882ca6340d6e8db81f3e2f9509d --- libs/binder/trusty/OS.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/binder/trusty/OS.cpp b/libs/binder/trusty/OS.cpp index 187add4a7b..7c811b75e9 100644 --- a/libs/binder/trusty/OS.cpp +++ b/libs/binder/trusty/OS.cpp @@ -14,7 +14,11 @@ * limitations under the License. */ +#if defined(TRUSTY_USERSPACE) #include +#else +#include +#endif #include "../OS.h" @@ -28,8 +32,13 @@ Result setNonBlocking(android::base::borrowed_fd fd) { } status_t getRandomBytes(uint8_t* data, size_t size) { +#if defined(TRUSTY_USERSPACE) int res = RAND_bytes(data, size); return res == 1 ? OK : UNKNOWN_ERROR; +#else + int res = rand_get_bytes(data, size); + return res == 0 ? OK : UNKNOWN_ERROR; +#endif // TRUSTY_USERSPACE } } // namespace android -- cgit v1.2.3-59-g8ed1b