Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cc7f8cb authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Remove dependency on openssl for Trusty kernel" am:... 

Merge "libbinder: Remove dependency on openssl for Trusty kernel" am: ec6e1ef4 am: 3e048943 am: 6f1f099e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2172828



Change-Id: I5304e0b5a4537999b68736bc6a3a85f2a1ff6455
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 122d97bc 6f1f099e

libs/binder/trusty/OS.cpp

+9 −0
Original line number Diff line number Diff line
@@ -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) {