From cb8d01f58a0057b437b1a448f9d8ba25bcc6d8da Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 21 Sep 2019 21:13:54 +0200 Subject: [PATCH] mod: bump versions --- go.mod | 6 +++--- go.sum | 12 ++++++------ ipc/winpipe/mksyscall.go | 2 +- tun/wintun/iphlpapi/mksyscall.go | 2 +- tun/wintun/namespace_windows.go | 2 +- tun/wintun/namespaceapi/mksyscall.go | 2 +- tun/wintun/nci/mksyscall.go | 2 +- tun/wintun/registry/mksyscall.go | 2 +- tun/wintun/setupapi/mksyscall.go | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 0017afe..34b1e72 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module golang.zx2c4.com/wireguard go 1.12 require ( - golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 - golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 - golang.org/x/sys v0.0.0-20190830023255-19e00faab6ad + golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc + golang.org/x/net v0.0.0-20191003171128-d98b1b443823 + golang.org/x/sys v0.0.0-20191003212358-c178f38b412c golang.org/x/text v0.3.2 ) diff --git a/go.sum b/go.sum index ce4dbb8..970f4cb 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,13 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM= -golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc h1:c0o/qxkaO2LF5t6fQrT4b5hzyggAkLLlCUjqfRxd8Q4= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191003171128-d98b1b443823 h1:Ypyv6BNJh07T1pUSrehkLemqPKXhus2MkfktJ91kRh4= +golang.org/x/net v0.0.0-20191003171128-d98b1b443823/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-20190830023255-19e00faab6ad h1:cCejgArrk10gX6kFqjWeLwXD7aVMqWoRpyUCaaJSggc= -golang.org/x/sys v0.0.0-20190830023255-19e00faab6ad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191003212358-c178f38b412c h1:6Zx7DRlKXf79yfxuQ/7GqV3w2y7aDsk6bGg0MzF5RVU= +golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/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= diff --git a/ipc/winpipe/mksyscall.go b/ipc/winpipe/mksyscall.go index 092cb8b..19ac03a 100644 --- a/ipc/winpipe/mksyscall.go +++ b/ipc/winpipe/mksyscall.go @@ -6,4 +6,4 @@ package winpipe -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go pipe.go file.go +//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go pipe.go file.go diff --git a/tun/wintun/iphlpapi/mksyscall.go b/tun/wintun/iphlpapi/mksyscall.go index f2639ea..fc7dba4 100644 --- a/tun/wintun/iphlpapi/mksyscall.go +++ b/tun/wintun/iphlpapi/mksyscall.go @@ -5,4 +5,4 @@ package iphlpapi -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go conversion_windows.go +//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go conversion_windows.go diff --git a/tun/wintun/namespace_windows.go b/tun/wintun/namespace_windows.go index 4530aee..f4316fe 100644 --- a/tun/wintun/namespace_windows.go +++ b/tun/wintun/namespace_windows.go @@ -37,7 +37,7 @@ func initializeNamespace() error { } wintunObjectSecurityAttributes = &windows.SecurityAttributes{ Length: uint32(unsafe.Sizeof(windows.SecurityAttributes{})), - SecurityDescriptor: uintptr(unsafe.Pointer(sd)), + SecurityDescriptor: sd, } sid, err := windows.CreateWellKnownSid(windows.WinLocalSystemSid) if err != nil { diff --git a/tun/wintun/namespaceapi/mksyscall.go b/tun/wintun/namespaceapi/mksyscall.go index c4c9595..93d43b0 100644 --- a/tun/wintun/namespaceapi/mksyscall.go +++ b/tun/wintun/namespaceapi/mksyscall.go @@ -5,4 +5,4 @@ package namespaceapi -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go namespaceapi_windows.go +//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go namespaceapi_windows.go diff --git a/tun/wintun/nci/mksyscall.go b/tun/wintun/nci/mksyscall.go index 15408f4..019da93 100644 --- a/tun/wintun/nci/mksyscall.go +++ b/tun/wintun/nci/mksyscall.go @@ -5,4 +5,4 @@ package nci -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go nci_windows.go +//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go nci_windows.go diff --git a/tun/wintun/registry/mksyscall.go b/tun/wintun/registry/mksyscall.go index d0cac6c..6ad82d2 100644 --- a/tun/wintun/registry/mksyscall.go +++ b/tun/wintun/registry/mksyscall.go @@ -5,4 +5,4 @@ package registry -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zregistry_windows.go registry_windows.go +//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zregistry_windows.go registry_windows.go diff --git a/tun/wintun/setupapi/mksyscall.go b/tun/wintun/setupapi/mksyscall.go index 3447dee..ac103a1 100644 --- a/tun/wintun/setupapi/mksyscall.go +++ b/tun/wintun/setupapi/mksyscall.go @@ -5,4 +5,4 @@ package setupapi -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsetupapi_windows.go setupapi_windows.go +//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsetupapi_windows.go setupapi_windows.go