Merge "libbinder: Remove dependency on openssl for Trusty kernel" (ec6e1ef4) · Commits · e / os / android_frameworks_native

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) {