diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2017-12-01 06:42:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-01 06:42:01 +0000 |
| commit | e2617559d938e794c3104ce4d1dbeaf4e921ef36 (patch) | |
| tree | e7e07144cbc9b03bb0f465fe7ef2dfe7088a562c | |
| parent | f50aea8e64b0d1ea610cdfc2024bc9e6922b0d40 (diff) | |
| parent | 4991f2ab66c360450ad0515cc76845264fe53f0d (diff) | |
| download | wpa_supplicant_8-e2617559d938e794c3104ce4d1dbeaf4e921ef36.tar.gz | |
Merge "Set CONFIG_NO_RANDOM_POOL=y"
am: 4991f2ab66
Change-Id: I1c91df3e623ee29845e53faf0c07c0cdd6ca9387
| -rw-r--r-- | hostapd/android.config | 7 | ||||
| -rw-r--r-- | hostapd/hostapd.android.rc | 1 | ||||
| -rw-r--r-- | wpa_supplicant/android.config | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/hostapd/android.config b/hostapd/android.config index b2938289..08d21f04 100644 --- a/hostapd/android.config +++ b/hostapd/android.config @@ -203,3 +203,10 @@ CONFIG_WPA_CLI_EDIT=y # Opportunistic Wireless Encryption (OWE) # Experimental implementation of draft-harkins-owe-07.txt #CONFIG_OWE=y + +# Wpa_supplicant's random pool is not necessary on Android. Randomness is +# already provided by the entropymixer service which ensures sufficient +# entropy is maintained across reboots. Commit b410eb1913 'Initialize +# /dev/urandom earlier in boot' seeds /dev/urandom with that entropy before +# either wpa_supplicant or hostapd are run. +CONFIG_NO_RANDOM_POOL=y diff --git a/hostapd/hostapd.android.rc b/hostapd/hostapd.android.rc index 672e1884..36b00af0 100644 --- a/hostapd/hostapd.android.rc +++ b/hostapd/hostapd.android.rc @@ -10,7 +10,6 @@ on post-fs-data mkdir /data/misc/wifi/hostapd 0770 wifi wifi service hostapd /vendor/bin/hostapd \ - -e /data/misc/wifi/entropy.bin \ /data/misc/wifi/hostapd.conf class main user wifi diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config index 70450ac6..fd65584c 100644 --- a/wpa_supplicant/android.config +++ b/wpa_supplicant/android.config @@ -442,7 +442,13 @@ CONFIG_ANDROID_LOG=y # disabled. This will save some in binary size and CPU use. However, this # should only be considered for builds that are known to be used on devices # that meet the requirements described above. -#CONFIG_NO_RANDOM_POOL=y + +# Wpa_supplicant's random pool is not necessary on Android. Randomness is +# already provided by the entropymixer service which ensures sufficient +# entropy is maintained across reboots. Commit b410eb1913 'Initialize +# /dev/urandom earlier in boot' seeds /dev/urandom with that entropy before +# either wpa_supplicant or hostapd are run. +CONFIG_NO_RANDOM_POOL=y # IEEE 802.11n (High Throughput) support (mainly for AP mode) CONFIG_IEEE80211N=y |