diff options
| author | 2022-08-22 23:24:21 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:24:21 +0000 | |
| commit | 034ee45d4be0ecf48f50642f2af04cecd4336c36 (patch) | |
| tree | ddb015399078b7caa21349e6ae36a7467ef2185c /libs | |
| parent | bec7ea1d5cf9fed35e4a7e50013598aa699c8150 (diff) | |
| parent | 2b08444e503d3eb07c62156d971dcd8ab0c350cc (diff) | |
Merge "libbinder: Remove dependency on openssl for Trusty kernel" am: ec6e1ef418 am: 3e04894334 am: 6f1f099e53 am: 1cc7f8cb43 am: 2b08444e50
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2172828
Change-Id: Idc99830a00f89b538d807b3db463443566a20eca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/trusty/OS.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/binder/trusty/OS.cpp b/libs/binder/trusty/OS.cpp index bbfa3818ea..b21fe6acf5 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 <openssl/rand.h> +#else +#include <lib/rand/rand.h> +#endif #include "../OS.h" @@ -28,8 +32,13 @@ Result<void> 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 } status_t dupFileDescriptor(int oldFd, int* newFd) { |