diff options
| author | Rich Cannings <richc@google.com> | 2018-10-09 13:56:37 -0700 |
|---|---|---|
| committer | syphyr <syphyr@gmail.com> | 2019-02-13 20:22:08 +0100 |
| commit | 1629e62c50b7f90e68a62ca7e3d4017b32181168 (patch) | |
| tree | a4b1c725c976ddb49fb7a4621f9b549c08f16465 | |
| parent | 369f60624cb6c85d54cf5077020d1be07d50c14e (diff) | |
| download | android_external_wpa_supplicant_8-cm-11.0.tar.gz android_external_wpa_supplicant_8-cm-11.0.tar.bz2 android_external_wpa_supplicant_8-cm-11.0.zip | |
Use BoringSSL to get random bytescm-11.0
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 053740e9..d920e417 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 384d89d6..1d8a8dab 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -913,6 +913,7 @@ endif ifndef CONFIG_TLS CONFIG_TLS=openssl +L_CFLAGS += -DCONFIG_USE_OPENSSL_RNG endif ifdef CONFIG_TLSV11 |