mod: bump versions

diff --git a/go.mod b/go.mod
index 0017afe24f0b5b753e22b097d0053a87dce8d3bb..34b1e720a8ea155ddb31f06ffb3911f48d38e626 100644 (file)
--- 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 ce4dbb84493cb904a9f665232c9f54c4afdfedca..970f4cbade7116a742de5f846def4e71aab54c1e 100644 (file)
--- 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 092cb8ba2b08cfa687775e6ba312306b180d4e4c..19ac03a67b3ba3b3efcaaca2a701f589034ed53f 100644 (file)
--- 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 f2639ea7ed13d61222ef61619590aa4c1db7848f..fc7dba41a6a4a5c16a7c8c912b88ce27728e40d8 100644 (file)
--- 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 4530aee4fe2d4c2fe56059d98d001257def02519..f4316fe84a3c28a840f9b85a0245cae4b14d5ebd 100644 (file)
--- 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 c4c95955aa3b77003028dcaf6a46d3b29ef5ba9c..93d43b0d2e737014d1fdfbaaaba1f6b2d664444c 100644 (file)
--- 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 15408f41063c1e529fce10e9f6d28d481860abe2..019da93b020c576e71bed7e88f2419d718bba86c 100644 (file)
--- 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 d0cac6ce4f7088f1ed951be3ef51cfc8dc09b73f..6ad82d2209e6ff1889e4187bf9ad3bdab2db9870 100644 (file)
--- 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 3447dee2905b32c3bcd1cfc2a641595876f028ba..ac103a1d3b8e5eae282d6049acde5c4ce7b8c198 100644 (file)
--- 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