summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2017-11-30 12:37:46 -0800
committerJeff Vander Stoep <jeffv@google.com>2017-11-30 12:43:30 -0800
commitbf2a846218cc94705f8f42683d27f0bf96a74b88 (patch)
treeb2fa8a44faf1fb36148c93cfeba2313dfca6257f
parent9b677bc7ca3b471c3a4924e6b234b73431268219 (diff)
downloadhikey-bf2a846218cc94705f8f42683d27f0bf96a74b88.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: Id07e6bd157baa4855fff6ddfbf248ad0bd512a40
-rw-r--r--init.common.rc2
-rw-r--r--sepolicy/hostapd.te1
2 files changed, 1 insertions, 2 deletions
diff --git a/init.common.rc b/init.common.rc
index 0481b641..9feaaccc 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -93,7 +93,7 @@ service uim /vendor/bin/uim
service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
+ -g@android:wpa_wlan0
socket wpa_wlan0 dgram 660 wifi wifi
class main
disabled
diff --git a/sepolicy/hostapd.te b/sepolicy/hostapd.te
index b7069692..86b985ae 100644
--- a/sepolicy/hostapd.te
+++ b/sepolicy/hostapd.te
@@ -2,7 +2,6 @@
# hostapd no longer directly accesses /data outside /data/vendor.
typeattribute hostapd data_between_core_and_vendor_violators;
# 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)