summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2017-11-30 12:45:12 -0800
committerJeff Vander Stoep <jeffv@google.com>2017-11-30 12:45:12 -0800
commit3ec4aa50607885772a7dfbf4c2d919e726d30944 (patch)
treee397e0bf0e88481cb62336a10aab8373f6802700
parentb5bc6b588f9912d9fe23a9df28628cdc42baabc7 (diff)
downloadbullhead-3ec4aa50607885772a7dfbf4c2d919e726d30944.tar.gz
wifi_supplicant: deprecate entropy.bin
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. Bug: 34980020 Test: Use wifi and wifi tethering on Taimen. Change-Id: Iba19e748a439156c60b6d73c8ee380c8b9c2ce19
-rw-r--r--init.bullhead.rc2
-rw-r--r--sepolicy/hostapd.te1
2 files changed, 1 insertions, 2 deletions
diff --git a/init.bullhead.rc b/init.bullhead.rc
index 4127607..4f43ade 100644
--- a/init.bullhead.rc
+++ b/init.bullhead.rc
@@ -351,7 +351,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/system/etc/wifi/wpa_supplicant_overlay.conf \
-puse_p2p_group_interface=1 \
- -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
+ -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
diff --git a/sepolicy/hostapd.te b/sepolicy/hostapd.te
index 15064a0..fdf6f51 100644
--- a/sepolicy/hostapd.te
+++ b/sepolicy/hostapd.te
@@ -1,5 +1,4 @@
# hostapd can read and write WiFi related data and configuration.
-# For example, the entropy file is periodically updated.
allow hostapd wifi_data_file:file rw_file_perms;
r_dir_file(hostapd, wifi_data_file)