global: prefer WireGuardNT over wireguard-go/Wintun

Also remove Wintun driver on startup.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 files changed, 1 insertions, 45 deletions

diff --git a/conf/admin_windows.go b/conf/admin_windows.go
index 3ac1cae0..a135aa6d 100644
--- a/conf/admin_windows.go
+++ b/conf/admin_windows.go
@@ -5,11 +5,7 @@
 
 package conf
 
-import (
-	"strings"
-
-	"golang.org/x/sys/windows/registry"
-)
+import "golang.org/x/sys/windows/registry"
 
 const adminRegKey = `Software\WireGuard`
 
@@ -27,34 +23,7 @@ func openAdminKey() (registry.Key, error) {
 	return adminKey, nil
 }
 
-func IsInsiderEnrolled() bool {
-	if AdminBool("IgnoreInsiderProgram") {
-		return false
-	}
-	key, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\WindowsSelfHost\Applicability`, registry.QUERY_VALUE)
-	if err != nil {
-		return false
-	}
-	defer key.Close()
-	val, _, err := key.GetIntegerValue("IsBuildFlightingEnabled")
-	if err != nil || val != 1 {
-		return false
-	}
-	val, _, err = key.GetIntegerValue("EnablePreviewBuilds")
-	if err != nil || val != 1 {
-		return false
-	}
-	ring, _, err := key.GetStringValue("Ring")
-	if err != nil || !strings.EqualFold(ring, "external") {
-		return false
-	}
-	return true
-}
-
 func AdminBool(name string) bool {
-	if name == "ExperimentalKernelDriver" && IsInsiderEnrolled() {
-		return true
-	}
 	key, err := openAdminKey()
 	if err != nil {
 		return false
@@ -65,16 +34,3 @@ func AdminBool(name string) bool {
 	}
 	return val != 0
 }
-
-func SetAdminBool(name string, val bool) error {
-	key, _, err := registry.CreateKey(registry.LOCAL_MACHINE, adminRegKey, registry.SET_VALUE|registry.WOW64_64KEY)
-	if err != nil {
-		return err
-	}
-	defer key.Close()
-	if val {
-		return key.SetDWordValue(name, 1)
-	} else {
-		return key.DeleteValue(name)
-	}
-}