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
Status: Merged
Approved by: Alfonso Sanchez-Beato
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
Alfonso Sanchez-Beato Approve
Roberto Mier Escandon (community) Approve
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.
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

lgtm

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/bin/ap.sh b/bin/ap.sh
index d72bb88..be1f440 100755
--- a/bin/ap.sh
+++ b/bin/ap.sh
@@ -170,9 +170,6 @@ $SNAP/bin/dnsmasq \
170 &170 &
171171
172driver=$WIFI_HOSTAPD_DRIVER172driver=$WIFI_HOSTAPD_DRIVER
173if [ "$driver" = "rtl8188" ] ; then
174 driver=rtl871xdrv
175fi
176173
177# Generate our hostapd configuration file174# Generate our hostapd configuration file
178cat <<EOF > $SNAP_DATA/hostapd.conf175cat <<EOF > $SNAP_DATA/hostapd.conf
@@ -262,14 +259,6 @@ if [ "$DEBUG" = "true" ] ; then
262fi259fi
263260
264hostapd=$SNAP/bin/hostapd261hostapd=$SNAP/bin/hostapd
265case "$WIFI_HOSTAPD_DRIVER" in
266 rtl8188)
267 hostapd=$SNAP/rtl8188/hostapd
268 ;;
269 *)
270 # Fallthrough and use the default hostapd
271 ;;
272esac
273262
274# Startup hostapd with the configuration we've put in place263# Startup hostapd with the configuration we've put in place
275$hostapd $EXTRA_ARGS $SNAP_DATA/hostapd.conf &264$hostapd $EXTRA_ARGS $SNAP_DATA/hostapd.conf &
diff --git a/conf/default-config b/conf/default-config
index dc916b2..c010799 100644
--- a/conf/default-config
+++ b/conf/default-config
@@ -35,7 +35,7 @@ WIFI_NETMASK=255.255.255.0
35# directly.35# directly.
36WIFI_INTERFACE_MODE=direct36WIFI_INTERFACE_MODE=direct
3737
38# Possible options are: nl80211, rtl818838# Possible options are: nl80211
39WIFI_HOSTAPD_DRIVER="nl80211"39WIFI_HOSTAPD_DRIVER="nl80211"
4040
41WIFI_SSID="Ubuntu"41WIFI_SSID="Ubuntu"
diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md
index 47abbd3..7483172 100644
--- a/docs/reference/configuration.md
+++ b/docs/reference/configuration.md
@@ -110,14 +110,13 @@ The hostapd driver being used.
110Possible values:110Possible values:
111111
112 * *nl80211*: Let hostapd talk through the nl80211 interface with the kernel WiFi drivers.112 * *nl80211*: Let hostapd talk through the nl80211 interface with the kernel WiFi drivers.
113 * *rtl8188*: A special hostapd version will be used which is specific for WiFi chips from Realtek.
114113
115Default value: *nl80211*114Default value: *nl80211*
116115
117Example:116Example:
118117
119```118```
120$ wifi-ap.config set wifi.hostapd-driver=rtl8188119$ wifi-ap.config set wifi.hostapd-driver=nl80211
121```120```
122121
123## wifi.ssid122## wifi.ssid
diff --git a/snapcraft.yaml b/snapcraft.yaml
index d1cab16..c6f1491 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -104,7 +104,7 @@ parts:
104 plugin: make104 plugin: make
105 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap105 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap
106 source-type: git106 source-type: git
107 source-branch: hostapd/2.5107 source-branch: hostapd/2.6
108 build-packages:108 build-packages:
109 - build-essential109 - build-essential
110 - pkg-config110 - pkg-config
@@ -121,26 +121,6 @@ parts:
121 prime:121 prime:
122 - $binaries122 - $binaries
123123
124 hostapd-rtl8188:
125 plugin: make
126 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap
127 source-type: git
128 source-branch: hostapd/2.5-rtl8188
129 build-packages:
130 - build-essential
131 - pkg-config
132 - libnl-3-dev
133 - libnl-genl-3-dev
134 - libnl-route-3-dev
135 - libssl-dev
136 make-parameters:
137 - BINDIR=/rtl8188
138 filesets:
139 binaries:
140 - rtl8188/hostapd
141 prime:
142 - $binaries
143
144 nmcli:124 nmcli:
145 plugin: nil125 plugin: nil
146 stage-packages:126 stage-packages:

Subscribers

People subscribed via source and target branches

to all changes: