diff options
| author | Rich Cannings <richc@google.com> | 2018-10-09 13:56:37 -0700 |
|---|---|---|
| committer | Kevin Haggerty <haggertk@lineageos.org> | 2019-02-21 05:42:29 +0100 |
| commit | c760900066f0d125d3a93cb5058322ac8bea51bb (patch) | |
| tree | f5a77fa798984ceaeb3cd228eed4493c90b8a68e | |
| parent | aa932e34985799fba87207e87fac74e6f404c1ba (diff) | |
| download | android_external_wpa_supplicant_8-c760900066f0d125d3a93cb5058322ac8bea51bb.tar.gz android_external_wpa_supplicant_8-c760900066f0d125d3a93cb5058322ac8bea51bb.tar.bz2 android_external_wpa_supplicant_8-c760900066f0d125d3a93cb5058322ac8bea51bb.zip | |
Use BoringSSL to get random bytes
Bug: 117508900
Change-Id: I4889513c0671ff2b689f1beca8084d6f149d473d
Test: Existing tests pass
(cherry picked from commit 29d54b87f121c79d5df87b0b2bcd7a1eb6090c1f)
| -rw-r--r-- | src/crypto/random.c | 7 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/crypto/random.c b/src/crypto/random.c index 3a86a93a..5d671bdc 100644 --- a/src/crypto/random.c +++ b/src/crypto/random.c @@ -160,10 +160,17 @@ int random_get_bytes(void *buf, size_t len) wpa_printf(MSG_MSGDUMP, "Get randomness: len=%u entropy=%u", (unsigned int) len, entropy); +#ifdef CONFIG_USE_OPENSSL_RNG + /* Start with assumed strong randomness from OpenSSL */ + ret = crypto_get_random(buf, len); + wpa_hexdump_key(MSG_EXCESSIVE, "random from crypto_get_random", + buf, len); +#else /* CONFIG_USE_OPENSSL_RNG */ /* Start with assumed strong randomness from OS */ ret = os_get_random(buf, len); wpa_hexdump_key(MSG_EXCESSIVE, "random from os_get_random", buf, len); +#endif /* CONFIG_USE_OPENSSL_RNG */ /* Mix in additional entropy extracted from the internal pool */ left = len; diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 87f357d2..9ea7ef9c 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -927,6 +927,7 @@ endif ifndef CONFIG_TLS CONFIG_TLS=openssl +L_CFLAGS += -DCONFIG_USE_OPENSSL_RNG endif ifdef CONFIG_TLSV11 |