Merge ~morphis/snappy-hwe-snaps/+git/wifi-ap:cve-fixes-for-krack into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

Proposed by Simon Fels on 2017-10-16
Status: Merged
Approved by: Alfonso Sanchez-Beato on 2017-10-16
Approved revision: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22
Merged at revision: 9390c725257937d02fbd5e6c4d324c242d1b7781
Proposed branch: ~morphis/snappy-hwe-snaps/+git/wifi-ap:cve-fixes-for-krack
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master
Diff against target: 102 lines (+3/-35)
4 files modified
bin/ap.sh (+0/-11)
conf/default-config (+1/-1)
docs/reference/configuration.md (+1/-2)
snapcraft.yaml (+1/-21)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve on 2017-10-16
Alfonso Sanchez-Beato Approve on 2017-10-16
Roberto Mier Escandón  (community) 2017-10-16 Approve on 2017-10-16
Review via email: mp+332312@code.launchpad.net

Description of the change

Update to hostapd 2.6 which has all CVE fixes for the krack attach applied

See https://w1.fi/security/2017-1/ for details

This also drops the rtl8188 custom implementation which never being used and not functional.

To post a comment you must log in.

lgtm

review: Approve

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/782/

LGTM

review: Approve

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/786/

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/787/

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/791/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/ap.sh b/bin/ap.sh
2index d72bb88..be1f440 100755
3--- a/bin/ap.sh
4+++ b/bin/ap.sh
5@@ -170,9 +170,6 @@ $SNAP/bin/dnsmasq \
6 &
7
8 driver=$WIFI_HOSTAPD_DRIVER
9-if [ "$driver" = "rtl8188" ] ; then
10- driver=rtl871xdrv
11-fi
12
13 # Generate our hostapd configuration file
14 cat <<EOF > $SNAP_DATA/hostapd.conf
15@@ -262,14 +259,6 @@ if [ "$DEBUG" = "true" ] ; then
16 fi
17
18 hostapd=$SNAP/bin/hostapd
19-case "$WIFI_HOSTAPD_DRIVER" in
20- rtl8188)
21- hostapd=$SNAP/rtl8188/hostapd
22- ;;
23- *)
24- # Fallthrough and use the default hostapd
25- ;;
26-esac
27
28 # Startup hostapd with the configuration we've put in place
29 $hostapd $EXTRA_ARGS $SNAP_DATA/hostapd.conf &
30diff --git a/conf/default-config b/conf/default-config
31index dc916b2..c010799 100644
32--- a/conf/default-config
33+++ b/conf/default-config
34@@ -35,7 +35,7 @@ WIFI_NETMASK=255.255.255.0
35 # directly.
36 WIFI_INTERFACE_MODE=direct
37
38-# Possible options are: nl80211, rtl8188
39+# Possible options are: nl80211
40 WIFI_HOSTAPD_DRIVER="nl80211"
41
42 WIFI_SSID="Ubuntu"
43diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md
44index 47abbd3..7483172 100644
45--- a/docs/reference/configuration.md
46+++ b/docs/reference/configuration.md
47@@ -110,14 +110,13 @@ The hostapd driver being used.
48 Possible values:
49
50 * *nl80211*: Let hostapd talk through the nl80211 interface with the kernel WiFi drivers.
51- * *rtl8188*: A special hostapd version will be used which is specific for WiFi chips from Realtek.
52
53 Default value: *nl80211*
54
55 Example:
56
57 ```
58-$ wifi-ap.config set wifi.hostapd-driver=rtl8188
59+$ wifi-ap.config set wifi.hostapd-driver=nl80211
60 ```
61
62 ## wifi.ssid
63diff --git a/snapcraft.yaml b/snapcraft.yaml
64index d1cab16..c6f1491 100644
65--- a/snapcraft.yaml
66+++ b/snapcraft.yaml
67@@ -104,7 +104,7 @@ parts:
68 plugin: make
69 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap
70 source-type: git
71- source-branch: hostapd/2.5
72+ source-branch: hostapd/2.6
73 build-packages:
74 - build-essential
75 - pkg-config
76@@ -121,26 +121,6 @@ parts:
77 prime:
78 - $binaries
79
80- hostapd-rtl8188:
81- plugin: make
82- source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap
83- source-type: git
84- source-branch: hostapd/2.5-rtl8188
85- build-packages:
86- - build-essential
87- - pkg-config
88- - libnl-3-dev
89- - libnl-genl-3-dev
90- - libnl-route-3-dev
91- - libssl-dev
92- make-parameters:
93- - BINDIR=/rtl8188
94- filesets:
95- binaries:
96- - rtl8188/hostapd
97- prime:
98- - $binaries
99-
100 nmcli:
101 plugin: nil
102 stage-packages:

Subscribers

People subscribed via source and target branches