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

[Simon Fels]

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.

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22

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

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:1b1ccaf254d84a2f2ffd74e6a70a7f2c87492d22
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/47/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/47
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/47
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/47
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/47

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/47/rebuild

review: Approve (continuous-integration)

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 \
 	&
 
 driver=$WIFI_HOSTAPD_DRIVER
-if [ "$driver" = "rtl8188" ] ; then
-	driver=rtl871xdrv
-fi
 
 # Generate our hostapd configuration file
 cat <<EOF > $SNAP_DATA/hostapd.conf
@@ -262,14 +259,6 @@ if [ "$DEBUG" = "true" ] ; then
 fi
 
 hostapd=$SNAP/bin/hostapd
-case "$WIFI_HOSTAPD_DRIVER" in
-	rtl8188)
-		hostapd=$SNAP/rtl8188/hostapd
-		;;
-	*)
-		# Fallthrough and use the default hostapd
-		;;
-esac
 
 # Startup hostapd with the configuration we've put in place
 $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
 #     directly.
 WIFI_INTERFACE_MODE=direct
 
-# Possible options are: nl80211, rtl8188
+# Possible options are: nl80211
 WIFI_HOSTAPD_DRIVER="nl80211"
 
 WIFI_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.
 Possible values:
 
  * *nl80211*: Let hostapd talk through the nl80211 interface with the kernel WiFi drivers.
- * *rtl8188*: A special hostapd version will be used which is specific for WiFi chips from Realtek.
 
 Default value: *nl80211*
 
 Example:
 
 ```
-$ wifi-ap.config set wifi.hostapd-driver=rtl8188
+$ wifi-ap.config set wifi.hostapd-driver=nl80211
 ```
 
 ## 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:
     plugin: make
     source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap
     source-type: git
-    source-branch: hostapd/2.5
+    source-branch: hostapd/2.6
     build-packages:
       - build-essential
       - pkg-config
@@ -121,26 +121,6 @@ parts:
     prime:
       - $binaries
 
-  hostapd-rtl8188:
-    plugin: make
-    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap
-    source-type: git
-    source-branch: hostapd/2.5-rtl8188
-    build-packages:
-      - build-essential
-      - pkg-config
-      - libnl-3-dev
-      - libnl-genl-3-dev
-      - libnl-route-3-dev
-      - libssl-dev
-    make-parameters:
-      - BINDIR=/rtl8188
-    filesets:
-      binaries:
-        - rtl8188/hostapd
-    prime:
-      - $binaries
-
   nmcli:
     plugin: nil
     stage-packages: