Remove TAP-Windows driver from installer, and update docs to reference Wintun's defau...

Signed-off-by: Daniel Lenski <dlenski@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 2cd27afaf9b4887f245ed23d29fa75c99b4ffaaf..05f118dcaf704952ff79b12ca90217773db99019 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,19 +293,8 @@ export V AM_DEFAULT_VERBOSITY bindir OBJDUMP
 file-list.txt: Makefile.dlldeps openconnect$(EXEEXT) libopenconnect.la $(WINTUN_DLL)
        @$(MAKE) --no-print-directory -f $< $@
 
-# OpenVPN TAP driver for Windows Vista/2003 and newer
-# (see https://community.openvpn.net/openvpn/wiki/GettingTapWindows)
-TAPDRIVER = tap-windows-9.21.2.exe
-TAPSHA256 = 645bee92ba4e9f32ddfdd9f8519dc1b9f9ff0b0a8e87e342f08d39da77e499a9
-
-$(TAPDRIVER):
-       curl https://build.openvpn.net/downloads/releases/tap-windows-9.21.2.exe -o $@
-
-# Validate file and also let make find it in VPATH
-file-list-$(TAPDRIVER).txt: $(TAPDRIVER)
-       echo $(TAPSHA256) $< | sha256sum -c
-       echo $< > $@
-
+# Wintun Layer 3 TUN driver for Windows 7 and newer
+# (see https://wintun.net)
 WINTUNDRIVER = wintun-0.10.2.zip
 WINTUNSHA256 = fcd9f62f1bd5a550fcb9c21fbb5d6a556214753ccbbd1a3ebad4d318ec9dcbef
 
@@ -327,10 +316,10 @@ file-list-%.txt: %
 # Rather than trying to get clever in NSIS and iterate over lists,
 # just emit raw snippets to be included separately in the install
 # and uninstall sections.
-instfiles.nsh: file-list.txt file-list-vpnc-script-win.js.txt file-list-$(TAPDRIVER).txt
+instfiles.nsh: file-list.txt file-list-vpnc-script-win.js.txt
        $(AM_V_GEN) cat $^ | while read FILE; do echo "File \"$${FILE}\"" ; done > $@
 
-uninstfiles.nsh: file-list.txt file-list-vpnc-script-win.js.txt file-list-$(TAPDRIVER).txt
+uninstfiles.nsh: file-list.txt file-list-vpnc-script-win.js.txt
        $(AM_V_GEN) cat $^ | while read FILE; do echo "Delete /rebootok \"\$$INSTDIR\\\\$${FILE##*/}\"" ; done > $@
 
 # Theoretically makensis can define symbols with the -D command line

diff --git a/openconnect.nsi.in b/openconnect.nsi.in
index c6d89472af927df171dc1875613df4d700ce3957..1a0c47951b62624b5ed9fbca0f6d241244cab3f1 100644 (file)
--- a/openconnect.nsi.in
+++ b/openconnect.nsi.in
@@ -71,21 +71,6 @@ Section "Desktop Icons"
   CreateShortCut "$DESKTOP\openconnect.exe.lnk" "$INSTDIR\.\openconnect.exe" "" "$INSTDIR\.\openconnect.exe" 0
 SectionEnd
 
-Section "TAP-Windows driver"
-  MessageBox MB_OK \
-    "OpenConnect uses the TAP-Windows driver from OpenVPN to create virtual Ethernet adapters for \
-     VPN connections. If you haven't already installed this driver, you should now install v9.21.2, \
-     which works on Windows 2003, Windows Vista, or newer. \
-     More information on this driver, and available versions, can be found at \
-     https://community.openvpn.net/openvpn/wiki/GettingTapWindows"
-
-  MessageBox MB_YESNO "Install TAP-Windows driver v9.21.2?" /SD IDYES IDNO endTapWindows
-    DetailPrint "Running TAP-Windows driver setup..."
-    ExecWait "$INSTDIR\tap-windows-9.21.2.exe"
-    DetailPrint "Finished TAP-Windows driver setup"
-  endTapWindows:
-SectionEnd
-
 Section "Uninstall"
   Delete /rebootok "$DESKTOP\openconnect.exe.lnk"
   Delete /rebootok "$SMPROGRAMS\OpenConnect\openconnect.exe.lnk"

diff --git a/www/building.xml b/www/building.xml
index be1089243beb4faa12e11c84fdb362758e9b0cd8..eb3e84583498b1a546898d95a27c5668de718870 100644 (file)
--- a/www/building.xml
+++ b/www/building.xml
@@ -5,7 +5,7 @@
        <VAR match="VAR_SEL_BUILDING" replace="selected" />
        <PARSE file="menu1.xml" />
        <PARSE file="menu2-started.xml" />
-       
+
        <INCLUDE file="inc/content.tmpl" />
 
        <h1>Building OpenConnect</h1>
@@ -118,8 +118,11 @@ require additional kernel modules to be installed.</p>
 <p>Solaris/OpenIndiana users will need the <a href="http://www.whiteboard.ne.jp/~admin2/tuntap/">Solaris TAP driver</a>.
 Note that for IPv6 support, the Solaris tun/tap driver from 16th Nov 2009 or newer is required.</p>
 
-<p>On Windows, version 9.9 or later of the <a href="https://community.openvpn.net/openvpn/wiki/ManagingWindowsTAPDrivers">TAP-Windows driver</a> from the <a href="https://openvpn.net/">OpenVPN project</a> is required. The easiest way to install the driver is to use the Windows installer from the <a href="https://openvpn.net/index.php/download/community-downloads.html">Community Downloads page</a>. The 64-bit installer contains signed drivers suitable for use on Windows 7 and later versions.</p>
+<p>On Windows, OpenConnect can use either the
+<a href="https://community.openvpn.net/openvpn/wiki/GettingTapWindows">TAP-Windows driver from OpenVPN</a> (version 9.9 or
+later; requires Windows 2003 or newer) or the <a href="https://www.wintun.net">Wintun layer-3 driver from Wireguard</a>
+(requires Windows 7 or newer). The more modern Wintun driver is included in the OpenConnect installer, starting
+with OpenConnect v9.00.</p>
 
        <INCLUDE file="inc/footer.tmpl" />
 </PAGE>
-

diff --git a/www/changelog.xml b/www/changelog.xml
index ca2a6885523b779f7fe24642e95112d92c700469..2a9551c9da0af8f563bad647f8950d97d874924a 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -38,7 +38,7 @@
        <li>Restore compatibility with newer Cisco servers, by no longer sending them the <tt>X-AnyConnect-Platform</tt> header (<a href="https://gitlab.com/openconnect/openconnect/-/issues/101">#101</a>, <a href="https://gitlab.com/openconnect/openconnect/-/merge_requests/175">!175</a>)</li>
        <li>Add support for PPP-based protocols, currently over TLS only (<a href="https://gitlab.com/openconnect/openconnect/-/merge_requests/165">!165</a>).</li>
        <li>Add support for two PPP-based protocols, F5 with <tt>--protocol=f5</tt> and Fortinet with <tt>--protocol=fortinet</tt> (<a href="https://gitlab.com/openconnect/openconnect/-/merge_requests/169">!169</a>).</li>
-       <li>Add support for <a href="https://www.wintun.net/">Wintun</a> Layer 3 TUN driver under Windows.</li>
+       <li>Add support for <a href="https://www.wintun.net/">Wintun</a> Layer 3 TUN driver under Windows (<a href="https://gitlab.com/openconnect/openconnect/-/issues/231">#231</a>).</li>
        <li>Fix output redirection under Windows (<a href="https://gitlab.com/openconnect/openconnect/-/issues/229">#229</a>)</li>
        <li>More gracefully handle Pulse/NC idle timeouts and other Pulse fatal errors (<a href="https://gitlab.com/openconnect/openconnect/-/issues/187">!187</a>)</li>
        <li>Ignore failures to fetch the NC landing page if the authentication was successful.</li>