diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-09-24 13:57:13 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-09-27 10:44:35 +0200 |
commit | 0079a4b42942beb74c3f713fb52389a72d95579a (patch) | |
tree | fd12d48fbe2d3fb184016ca8ae7ff7e512f46049 | |
parent | Revert "updater: use winhttp to reduce filesize" (diff) | |
download | wireguard-windows-0079a4b42942beb74c3f713fb52389a72d95579a.tar.xz wireguard-windows-0079a4b42942beb74c3f713fb52389a72d95579a.zip |
mod: bump versions
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r-- | elevate/privileges.go | 2 | ||||
-rw-r--r-- | elevate/shellexecute.go | 2 | ||||
-rw-r--r-- | go.mod | 8 | ||||
-rw-r--r-- | go.sum | 17 | ||||
-rw-r--r-- | main.go | 4 | ||||
-rw-r--r-- | tunnel/firewall/helpers.go | 2 | ||||
-rw-r--r-- | tunnel/winipcfg/winipcfg_test.go | 2 | ||||
-rw-r--r-- | ui/ui.go | 2 |
8 files changed, 19 insertions, 20 deletions
diff --git a/elevate/privileges.go b/elevate/privileges.go index eae0ac3e..84fdb2bd 100644 --- a/elevate/privileges.go +++ b/elevate/privileges.go @@ -22,7 +22,7 @@ func DropAllPrivileges(retainDriverLoading bool) error { } } var processToken windows.Token - err := windows.OpenProcessToken(windows.GetCurrentProcess(), windows.TOKEN_READ|windows.TOKEN_WRITE, &processToken) + err := windows.OpenProcessToken(windows.CurrentProcess(), windows.TOKEN_READ|windows.TOKEN_WRITE, &processToken) if err != nil { return err } diff --git a/elevate/shellexecute.go b/elevate/shellexecute.go index b1dcc155..acb5b2e2 100644 --- a/elevate/shellexecute.go +++ b/elevate/shellexecute.go @@ -46,7 +46,7 @@ func ShellExecute(program string, arguments string, directory string, show int32 }() var processToken windows.Token - err = windows.OpenProcessToken(windows.GetCurrentProcess(), windows.TOKEN_QUERY|windows.TOKEN_DUPLICATE, &processToken) + err = windows.OpenProcessToken(windows.CurrentProcess(), windows.TOKEN_QUERY|windows.TOKEN_DUPLICATE, &processToken) if err != nil { return } @@ -4,11 +4,11 @@ require ( github.com/lxn/walk v0.0.0-20190923074432-2011aca68435 github.com/lxn/win v0.0.0-20190919090605-24c5960b03d8 - golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 - golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72 - golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 + golang.org/x/crypto v0.0.0-20190926180335-cea2066c6411 + golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 + golang.org/x/sys v0.0.0-20190926180325-855e68c8590b golang.org/x/text v0.3.2 - golang.zx2c4.com/wireguard v0.0.20190909-0.20190922100135-5774e6be91d3 + golang.zx2c4.com/wireguard v0.0.20190909-0.20190926195357-e90ae94ff879 ) replace ( @@ -1,21 +1,20 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20190926180335-cea2066c6411 h1:kuW9k4QvBJpRjC3rxEytsfIYPs8oGY3Jw7iR36h0FIY= +golang.org/x/crypto v0.0.0-20190926180335-cea2066c6411/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72 h1:PdU68SuVQNpTFEyGl0zoQOMysY+E0innv/QbAqV853w= -golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 h1:qPnAdmjNA41t3QBTx2mFGf/SD1IoslhYu7AmdsVzCcs= +golang.org/x/net v0.0.0-20190926025831-c00fd9afed17/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLgaVbMHMn2ISQXJeJ5EM= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190926180325-855e68c8590b h1:/8GN4qrAmRZQXgjWZHj9z/UJI5vNqQhPtgcw02z2f+8= +golang.org/x/sys v0.0.0-20190926180325-855e68c8590b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.zx2c4.com/wireguard v0.0.20190909-0.20190922100135-5774e6be91d3 h1:kpi3yed7t47yI5s7u8Z3AXqC0FfMxrCfwIsITux2VrA= -golang.zx2c4.com/wireguard v0.0.20190909-0.20190922100135-5774e6be91d3/go.mod h1:kknHs/HWB+cZKvHHzBldTe9HL6GEOpFswULW8LBwL4I= +golang.zx2c4.com/wireguard v0.0.20190909-0.20190926195357-e90ae94ff879 h1:5Weua4zPR4Gj3XgDlJPuFn/OhwCGgGuwZXt480SPUZI= +golang.zx2c4.com/wireguard v0.0.20190909-0.20190926195357-e90ae94ff879/go.mod h1:LHi31duR/H8GNUwqXZq8+/SwXTpcyhUQz9NZW6MxaZA= golang.zx2c4.com/wireguard/windows v0.0.0-20190919090605-24c5960b03d8 h1:2CuUpdfLMlq7rEKdaFDmGBD3ZF/5tHuXyroxn7hI108= golang.zx2c4.com/wireguard/windows v0.0.0-20190919090605-24c5960b03d8/go.mod h1:ouWl4wViUNh8tPSIwxTVMuS014WakR1hqvBc2I0bMoA= golang.zx2c4.com/wireguard/windows v0.0.0-20190923132714-5140ce15c7bb h1:8IrysvOZUbs+bZinn04cTGAWO03Sn6PPzDhWBiQim+s= @@ -57,7 +57,7 @@ func usage() { func checkForWow64() { var b bool - err := windows.IsWow64Process(windows.GetCurrentProcess(), &b) + err := windows.IsWow64Process(windows.CurrentProcess(), &b) if err != nil { fatalf("Unable to determine whether the process is running under WOW64: %v", err) } @@ -69,7 +69,7 @@ func checkForWow64() { func checkForAdminGroup() { // This is not a security check, but rather a user-confusion one. var processToken windows.Token - err := windows.OpenProcessToken(windows.GetCurrentProcess(), windows.TOKEN_QUERY|windows.TOKEN_DUPLICATE, &processToken) + err := windows.OpenProcessToken(windows.CurrentProcess(), windows.TOKEN_QUERY|windows.TOKEN_DUPLICATE, &processToken) if err != nil { fatalf("Unable to open current process token: %v", err) } diff --git a/tunnel/firewall/helpers.go b/tunnel/firewall/helpers.go index 04e5c664..0c9e8e3f 100644 --- a/tunnel/firewall/helpers.go +++ b/tunnel/firewall/helpers.go @@ -73,7 +73,7 @@ func wrapErr(err error) error { func getCurrentProcessSecurityDescriptor() (*windows.SECURITY_DESCRIPTOR, error) { var processToken windows.Token - err := windows.OpenProcessToken(windows.GetCurrentProcess(), windows.TOKEN_QUERY, &processToken) + err := windows.OpenProcessToken(windows.CurrentProcess(), windows.TOKEN_QUERY, &processToken) if err != nil { return nil, wrapErr(err) } diff --git a/tunnel/winipcfg/winipcfg_test.go b/tunnel/winipcfg/winipcfg_test.go index 2b0c5ff5..0251aecf 100644 --- a/tunnel/winipcfg/winipcfg_test.go +++ b/tunnel/winipcfg/winipcfg_test.go @@ -57,7 +57,7 @@ var ( func runningElevated() bool { var process windows.Token - err := windows.OpenProcessToken(windows.GetCurrentProcess(), windows.TOKEN_QUERY, &process) + err := windows.OpenProcessToken(windows.CurrentProcess(), windows.TOKEN_QUERY, &process) if err != nil { return false } @@ -25,7 +25,7 @@ var startTime = time.Now() func RunUI() { runtime.LockOSThread() - windows.SetProcessPriorityBoost(windows.GetCurrentProcess(), false) + windows.SetProcessPriorityBoost(windows.CurrentProcess(), false) defer func() { if err := recover(); err != nil { showErrorCustom(nil, "Panic", fmt.Sprint(err, "\n\n", string(debug.Stack()))) |