From 1ece91cedea7f8b39705885611a5703cda04a169 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Tue, 25 May 2021 12:42:22 -0700 Subject: [PATCH] go.mod: upgrade wireguard-windows, de-fork wireguard-go Pull in the latest version of wireguard-windows. Switch to upstream wireguard-go. This requires reverting all of our import paths. Unfortunately, this has to happen at the same time. The wireguard-go change is very low risk, as that commit matches our fork almost exactly. (The only changes are import paths, CI files, and a go.mod entry.) So if there are issues as a result of this commit, the first place to look is wireguard-windows changes. Signed-off-by: Josh Bleecher Snyder --- cmd/tailscaled/depaware.txt | 32 ++++++++++++------------- go.mod | 10 ++++---- go.sum | 20 ++++++++++++++++ net/tstun/fake.go | 2 +- net/tstun/ifstatus_noop.go | 2 +- net/tstun/ifstatus_windows.go | 2 +- net/tstun/tun.go | 2 +- net/tstun/tun_notwindows.go | 2 +- net/tstun/tun_windows.go | 4 ++-- net/tstun/wrap.go | 4 ++-- net/tstun/wrap_test.go | 2 +- wgengine/bench/wg.go | 2 +- wgengine/magicsock/legacy.go | 4 ++-- wgengine/magicsock/magicsock.go | 2 +- wgengine/magicsock/magicsock_test.go | 4 ++-- wgengine/mem_ios.go | 2 +- wgengine/router/ifconfig_windows.go | 2 +- wgengine/router/router.go | 2 +- wgengine/router/router_darwin.go | 2 +- wgengine/router/router_default.go | 2 +- wgengine/router/router_freebsd.go | 2 +- wgengine/router/router_linux.go | 2 +- wgengine/router/router_linux_test.go | 2 +- wgengine/router/router_openbsd.go | 2 +- wgengine/router/router_userspace_bsd.go | 2 +- wgengine/router/router_windows.go | 2 +- wgengine/userspace.go | 4 ++-- wgengine/userspace_ext_test.go | 2 +- wgengine/wgcfg/device.go | 2 +- wgengine/wgcfg/device_test.go | 6 ++--- wgengine/wglog/wglog.go | 2 +- 31 files changed, 77 insertions(+), 55 deletions(-) diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index e33f62735..ad4ff8032 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -22,21 +22,21 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de L 💣 github.com/mdlayher/netlink/nlenc from github.com/jsimonetti/rtnetlink+ L github.com/mdlayher/sdnotify from tailscale.com/util/systemd W github.com/pkg/errors from github.com/github/certstore - 💣 github.com/tailscale/wireguard-go/conn from github.com/tailscale/wireguard-go/device+ - W 💣 github.com/tailscale/wireguard-go/conn/winrio from github.com/tailscale/wireguard-go/conn - 💣 github.com/tailscale/wireguard-go/device from tailscale.com/wgengine+ - 💣 github.com/tailscale/wireguard-go/ipc from github.com/tailscale/wireguard-go/device - W 💣 github.com/tailscale/wireguard-go/ipc/winpipe from github.com/tailscale/wireguard-go/ipc - github.com/tailscale/wireguard-go/ratelimiter from github.com/tailscale/wireguard-go/device - github.com/tailscale/wireguard-go/replay from github.com/tailscale/wireguard-go/device - github.com/tailscale/wireguard-go/rwcancel from github.com/tailscale/wireguard-go/device+ - github.com/tailscale/wireguard-go/tai64n from github.com/tailscale/wireguard-go/device+ - 💣 github.com/tailscale/wireguard-go/tun from github.com/tailscale/wireguard-go/device+ - W 💣 github.com/tailscale/wireguard-go/tun/wintun from github.com/tailscale/wireguard-go/tun+ github.com/tcnksm/go-httpstat from tailscale.com/net/netcheck 💣 go4.org/intern from inet.af/netaddr 💣 go4.org/mem from tailscale.com/control/controlclient+ go4.org/unsafe/assume-no-moving-gc from go4.org/intern + 💣 golang.zx2c4.com/wireguard/conn from golang.zx2c4.com/wireguard/device+ + W 💣 golang.zx2c4.com/wireguard/conn/winrio from golang.zx2c4.com/wireguard/conn + 💣 golang.zx2c4.com/wireguard/device from tailscale.com/net/tstun+ + 💣 golang.zx2c4.com/wireguard/ipc from golang.zx2c4.com/wireguard/device + W 💣 golang.zx2c4.com/wireguard/ipc/winpipe from golang.zx2c4.com/wireguard/ipc + golang.zx2c4.com/wireguard/ratelimiter from golang.zx2c4.com/wireguard/device + golang.zx2c4.com/wireguard/replay from golang.zx2c4.com/wireguard/device + golang.zx2c4.com/wireguard/rwcancel from golang.zx2c4.com/wireguard/device+ + golang.zx2c4.com/wireguard/tai64n from golang.zx2c4.com/wireguard/device+ + 💣 golang.zx2c4.com/wireguard/tun from golang.zx2c4.com/wireguard/device+ + W 💣 golang.zx2c4.com/wireguard/tun/wintun from golang.zx2c4.com/wireguard/tun+ W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/net/interfaces+ inet.af/netaddr from tailscale.com/control/controlclient+ 💣 inet.af/netstack/gohacks from inet.af/netstack/state/wire+ @@ -155,7 +155,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/wgengine/wglog from tailscale.com/wgengine W 💣 tailscale.com/wgengine/winnet from tailscale.com/wgengine/router golang.org/x/crypto/blake2b from golang.org/x/crypto/nacl/box - golang.org/x/crypto/blake2s from github.com/tailscale/wireguard-go/device+ + golang.org/x/crypto/blake2s from golang.zx2c4.com/wireguard/device+ golang.org/x/crypto/chacha20 from golang.org/x/crypto/chacha20poly1305 golang.org/x/crypto/chacha20poly1305 from crypto/tls+ golang.org/x/crypto/cryptobyte from crypto/ecdsa+ @@ -164,7 +164,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de golang.org/x/crypto/hkdf from crypto/tls golang.org/x/crypto/nacl/box from tailscale.com/control/controlclient+ golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box - golang.org/x/crypto/poly1305 from github.com/tailscale/wireguard-go/device+ + golang.org/x/crypto/poly1305 from golang.org/x/crypto/chacha20poly1305+ golang.org/x/crypto/salsa20/salsa from golang.org/x/crypto/nacl/box+ golang.org/x/net/bpf from github.com/mdlayher/netlink+ golang.org/x/net/dns/dnsmessage from net+ @@ -172,15 +172,15 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de golang.org/x/net/http/httpproxy from net/http golang.org/x/net/http2/hpack from net/http golang.org/x/net/idna from golang.org/x/net/http/httpguts+ - golang.org/x/net/ipv4 from github.com/tailscale/wireguard-go/device - golang.org/x/net/ipv6 from github.com/tailscale/wireguard-go/device+ + golang.org/x/net/ipv4 from golang.zx2c4.com/wireguard/device + golang.org/x/net/ipv6 from golang.zx2c4.com/wireguard/device+ golang.org/x/net/proxy from tailscale.com/net/netns D golang.org/x/net/route from net+ golang.org/x/sync/errgroup from tailscale.com/derp golang.org/x/sync/singleflight from tailscale.com/net/dnscache golang.org/x/sys/cpu from golang.org/x/crypto/blake2b+ LD golang.org/x/sys/unix from github.com/jsimonetti/rtnetlink/internal/unix+ - W golang.org/x/sys/windows from github.com/tailscale/wireguard-go/conn+ + W golang.org/x/sys/windows from github.com/go-ole/go-ole+ W golang.org/x/sys/windows/registry from golang.zx2c4.com/wireguard/windows/tunnel/winipcfg+ W golang.org/x/sys/windows/svc from tailscale.com/cmd/tailscaled+ W golang.org/x/sys/windows/svc/mgr from tailscale.com/cmd/tailscaled diff --git a/go.mod b/go.mod index 397e2bd99..417a8f49e 100644 --- a/go.mod +++ b/go.mod @@ -29,13 +29,15 @@ require ( github.com/toqueteos/webbrowser v1.2.0 go4.org/mem v0.0.0-20201119185036-c04c5a6ff174 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a - golang.org/x/net v0.0.0-20210521195947-fe42d452be8f + golang.org/x/net v0.0.0-20210525063256-abc453219eb5 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20210521203332-0cec03c779c1 + golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea golang.org/x/term v0.0.0-20210503060354-a79de5458b56 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba - golang.org/x/tools v0.1.1 - golang.zx2c4.com/wireguard/windows v0.1.2-0.20201113162609-9b85be97fdf8 + golang.org/x/tools v0.1.2 + golang.zx2c4.com/wireguard v0.0.0-20210525143454-64cb82f2b3f5 // indirect + golang.zx2c4.com/wireguard/windows v0.3.15-0.20210525143335-94c0476d63e3 + gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect honnef.co/go/tools v0.1.4 inet.af/netaddr v0.0.0-20210523191804-d57edf19c517 inet.af/netstack v0.0.0-20210317161235-a1bf4e56ef22 diff --git a/go.sum b/go.sum index 644a5bd41..ac7eba517 100644 --- a/go.sum +++ b/go.sum @@ -343,7 +343,11 @@ github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+s github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lxn/walk v0.0.0-20201110160827-18ea5e372cdb/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ= +github.com/lxn/walk v0.0.0-20210112085537-c389da54e794 h1:NVRJ0Uy0SOFcXSKLsS65OmI1sgCCfiDUPj+cwnH7GZw= +github.com/lxn/walk v0.0.0-20210112085537-c389da54e794/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ= github.com/lxn/win v0.0.0-20201111105847-2a20daff6a55/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk= +github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc= +github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= @@ -680,6 +684,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210521195947-fe42d452be8f h1:Si4U+UcgJzya9kpiEUJKQvjr512OLli+gL4poHrz93U= golang.org/x/net v0.0.0-20210521195947-fe42d452be8f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -743,6 +749,7 @@ golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210301091718-77cc2087c03b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309040221-94ec62e08169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -750,6 +757,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210521203332-0cec03c779c1 h1:lCnv+lfrU9FRPGf8NeRuWAAPjNnema5WtBinMgs1fD8= golang.org/x/sys v0.0.0-20210521203332-0cec03c779c1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea h1:+WiDlPBBaO+h9vPNZi8uJ3k4BkKQB7Iow3aqwHVA5hI= +golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210503060354-a79de5458b56 h1:b8jxX3zqjpqb2LklXPzKSGJhzyxCOZSz8ncv8Nv+y7w= @@ -761,6 +770,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7-0.20210524175448-3115f89c4b99 h1:ZEXtoJu1S0ie/EmdYnjY3CqaCCZxnldL+K1ftMITD2Q= +golang.org/x/text v0.3.7-0.20210524175448-3115f89c4b99/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE= @@ -818,15 +829,22 @@ golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.zx2c4.com/wireguard v0.0.0-20210521230051-c27ff9b9f6f7/go.mod h1:a057zjmoc00UN7gVkaJt2sXVK523kMJcogDTEvPIasg= +golang.zx2c4.com/wireguard v0.0.0-20210525143454-64cb82f2b3f5 h1:5D3v3AKu7ktIhDlqZhZ4+YeNKsW+dnc2+zfFAdhwa8M= +golang.zx2c4.com/wireguard v0.0.0-20210525143454-64cb82f2b3f5/go.mod h1:laHzsbfMhGSobUmruXWAyMKKHSqvIcrqZJMyHD+/3O8= golang.zx2c4.com/wireguard v0.0.20200321-0.20201111175144-60b3766b89b9 h1:qowcZ56hhpeoESmWzI4Exhx4Y78TpCyXUJur4/c0CoE= golang.zx2c4.com/wireguard v0.0.20200321-0.20201111175144-60b3766b89b9/go.mod h1:LMeNfjlcPZTrBC1juwgbQyA4Zy2XVcsrdO/fIJxwyuA= golang.zx2c4.com/wireguard/windows v0.1.2-0.20201113162609-9b85be97fdf8 h1:nlXPqGA98n+qcq1pwZ28KjM5EsFQvamKS00A+VUeVjs= golang.zx2c4.com/wireguard/windows v0.1.2-0.20201113162609-9b85be97fdf8/go.mod h1:psva4yDnAHLuh7lUzOK7J7bLYxNFfo0iKWz+mi9gzkA= +golang.zx2c4.com/wireguard/windows v0.3.15-0.20210525143335-94c0476d63e3 h1:Xw0ZuZcvq981iPGZoLrUXhrK2jOJAw/B6gZxc6g8FsU= +golang.zx2c4.com/wireguard/windows v0.3.15-0.20210525143335-94c0476d63e3/go.mod h1:f/UVhQ6vXZKDodGB3Glgwu9B3djRxR14jIbcuxD8NBw= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -854,6 +872,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/Knetic/govaluate.v3 v3.0.0 h1:18mUyIt4ZlRlFZAAfVetz4/rzlJs9yhN+U02F4u1AOc= +gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/net/tstun/fake.go b/net/tstun/fake.go index f9c3a9d6f..09d68b6ba 100644 --- a/net/tstun/fake.go +++ b/net/tstun/fake.go @@ -8,7 +8,7 @@ import ( "io" "os" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" ) type fakeTUN struct { diff --git a/net/tstun/ifstatus_noop.go b/net/tstun/ifstatus_noop.go index 223be7949..43795abcb 100644 --- a/net/tstun/ifstatus_noop.go +++ b/net/tstun/ifstatus_noop.go @@ -9,7 +9,7 @@ package tstun import ( "time" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "tailscale.com/types/logger" ) diff --git a/net/tstun/ifstatus_windows.go b/net/tstun/ifstatus_windows.go index dc0e4a24d..7bbbfba5e 100644 --- a/net/tstun/ifstatus_windows.go +++ b/net/tstun/ifstatus_windows.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "tailscale.com/types/logger" ) diff --git a/net/tstun/tun.go b/net/tstun/tun.go index 4e0187ed4..c1c20d15f 100644 --- a/net/tstun/tun.go +++ b/net/tstun/tun.go @@ -13,7 +13,7 @@ import ( "runtime" "time" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "tailscale.com/types/logger" "tailscale.com/version/distro" ) diff --git a/net/tstun/tun_notwindows.go b/net/tstun/tun_notwindows.go index 078bccd47..ab071cf64 100644 --- a/net/tstun/tun_notwindows.go +++ b/net/tstun/tun_notwindows.go @@ -6,7 +6,7 @@ package tstun -import "github.com/tailscale/wireguard-go/tun" +import "golang.zx2c4.com/wireguard/tun" func interfaceName(dev tun.Device) (string, error) { return dev.Name() diff --git a/net/tstun/tun_windows.go b/net/tstun/tun_windows.go index 786c09408..92f898c6d 100644 --- a/net/tstun/tun_windows.go +++ b/net/tstun/tun_windows.go @@ -5,9 +5,9 @@ package tstun import ( - "github.com/tailscale/wireguard-go/tun" - "github.com/tailscale/wireguard-go/tun/wintun" "golang.org/x/sys/windows" + "golang.zx2c4.com/wireguard/tun" + "golang.zx2c4.com/wireguard/tun/wintun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" ) diff --git a/net/tstun/wrap.go b/net/tstun/wrap.go index 9ba726e71..c65b65c88 100644 --- a/net/tstun/wrap.go +++ b/net/tstun/wrap.go @@ -14,8 +14,8 @@ import ( "sync/atomic" "time" - "github.com/tailscale/wireguard-go/device" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/device" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/net/packet" "tailscale.com/types/ipproto" diff --git a/net/tstun/wrap_test.go b/net/tstun/wrap_test.go index e9a030a34..9b9c49cf3 100644 --- a/net/tstun/wrap_test.go +++ b/net/tstun/wrap_test.go @@ -14,7 +14,7 @@ import ( "testing" "unsafe" - "github.com/tailscale/wireguard-go/tun/tuntest" + "golang.zx2c4.com/wireguard/tun/tuntest" "inet.af/netaddr" "tailscale.com/net/packet" "tailscale.com/types/ipproto" diff --git a/wgengine/bench/wg.go b/wgengine/bench/wg.go index 21554e814..ff9ea64c3 100644 --- a/wgengine/bench/wg.go +++ b/wgengine/bench/wg.go @@ -12,7 +12,7 @@ import ( "sync" "testing" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/net/dns" diff --git a/wgengine/magicsock/legacy.go b/wgengine/magicsock/legacy.go index 4facdb5f5..420c717ef 100644 --- a/wgengine/magicsock/legacy.go +++ b/wgengine/magicsock/legacy.go @@ -16,11 +16,11 @@ import ( "sync" "time" - "github.com/tailscale/wireguard-go/conn" - "github.com/tailscale/wireguard-go/tai64n" "golang.org/x/crypto/blake2s" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/poly1305" + "golang.zx2c4.com/wireguard/conn" + "golang.zx2c4.com/wireguard/tai64n" "inet.af/netaddr" "tailscale.com/ipn/ipnstate" "tailscale.com/types/key" diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index 5383251dc..342bc19a0 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "github.com/tailscale/wireguard-go/conn" "golang.org/x/crypto/nacl/box" "golang.org/x/time/rate" + "golang.zx2c4.com/wireguard/conn" "inet.af/netaddr" "tailscale.com/control/controlclient" "tailscale.com/derp" diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index af16db82d..a54c69470 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -26,9 +26,9 @@ import ( "time" "unsafe" - "github.com/tailscale/wireguard-go/device" - "github.com/tailscale/wireguard-go/tun/tuntest" "golang.org/x/crypto/nacl/box" + "golang.zx2c4.com/wireguard/device" + "golang.zx2c4.com/wireguard/tun/tuntest" "inet.af/netaddr" "tailscale.com/derp" "tailscale.com/derp/derphttp" diff --git a/wgengine/mem_ios.go b/wgengine/mem_ios.go index ba370104b..f91586edb 100644 --- a/wgengine/mem_ios.go +++ b/wgengine/mem_ios.go @@ -5,7 +5,7 @@ package wgengine import ( - "github.com/tailscale/wireguard-go/device" + "golang.zx2c4.com/wireguard/device" ) // iOS has a very restrictive memory limit on network extensions. diff --git a/wgengine/router/ifconfig_windows.go b/wgengine/router/ifconfig_windows.go index 24da9d50d..3c8f97642 100644 --- a/wgengine/router/ifconfig_windows.go +++ b/wgengine/router/ifconfig_windows.go @@ -17,8 +17,8 @@ import ( "github.com/go-multierror/multierror" ole "github.com/go-ole/go-ole" - "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/windows" + "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "inet.af/netaddr" "tailscale.com/health" diff --git a/wgengine/router/router.go b/wgengine/router/router.go index 647aec07b..67bb312b5 100644 --- a/wgengine/router/router.go +++ b/wgengine/router/router.go @@ -7,7 +7,7 @@ package router import ( - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/types/logger" "tailscale.com/types/preftype" diff --git a/wgengine/router/router_darwin.go b/wgengine/router/router_darwin.go index 58ba8e6d3..f5408e387 100644 --- a/wgengine/router/router_darwin.go +++ b/wgengine/router/router_darwin.go @@ -5,7 +5,7 @@ package router import ( - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "tailscale.com/types/logger" ) diff --git a/wgengine/router/router_default.go b/wgengine/router/router_default.go index 7f05da42f..756e88d07 100644 --- a/wgengine/router/router_default.go +++ b/wgengine/router/router_default.go @@ -7,7 +7,7 @@ package router import ( - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "tailscale.com/types/logger" ) diff --git a/wgengine/router/router_freebsd.go b/wgengine/router/router_freebsd.go index 6e9380299..0e88b709c 100644 --- a/wgengine/router/router_freebsd.go +++ b/wgengine/router/router_freebsd.go @@ -5,7 +5,7 @@ package router import ( - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "tailscale.com/types/logger" ) diff --git a/wgengine/router/router_linux.go b/wgengine/router/router_linux.go index d1c16d623..907632d5c 100644 --- a/wgengine/router/router_linux.go +++ b/wgengine/router/router_linux.go @@ -16,7 +16,7 @@ import ( "github.com/coreos/go-iptables/iptables" "github.com/go-multierror/multierror" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/net/tsaddr" "tailscale.com/types/logger" diff --git a/wgengine/router/router_linux_test.go b/wgengine/router/router_linux_test.go index 1aae98f1b..6887dd1e1 100644 --- a/wgengine/router/router_linux_test.go +++ b/wgengine/router/router_linux_test.go @@ -16,7 +16,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" ) diff --git a/wgengine/router/router_openbsd.go b/wgengine/router/router_openbsd.go index def6f30c0..fe53910f2 100644 --- a/wgengine/router/router_openbsd.go +++ b/wgengine/router/router_openbsd.go @@ -10,7 +10,7 @@ import ( "log" "os/exec" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/types/logger" ) diff --git a/wgengine/router/router_userspace_bsd.go b/wgengine/router/router_userspace_bsd.go index eacd0ed4c..7a9482324 100644 --- a/wgengine/router/router_userspace_bsd.go +++ b/wgengine/router/router_userspace_bsd.go @@ -12,7 +12,7 @@ import ( "os/exec" "runtime" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/net/tsaddr" "tailscale.com/types/logger" diff --git a/wgengine/router/router_windows.go b/wgengine/router/router_windows.go index d9c1da3aa..e2d62792a 100644 --- a/wgengine/router/router_windows.go +++ b/wgengine/router/router_windows.go @@ -16,8 +16,8 @@ import ( "syscall" "time" - "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/windows" + "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "inet.af/netaddr" "tailscale.com/logtail/backoff" diff --git a/wgengine/userspace.go b/wgengine/userspace.go index e368ac635..efcfc9dab 100644 --- a/wgengine/userspace.go +++ b/wgengine/userspace.go @@ -20,9 +20,9 @@ import ( "sync/atomic" "time" - "github.com/tailscale/wireguard-go/device" - "github.com/tailscale/wireguard-go/tun" "go4.org/mem" + "golang.zx2c4.com/wireguard/device" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/control/controlclient" "tailscale.com/health" diff --git a/wgengine/userspace_ext_test.go b/wgengine/userspace_ext_test.go index 94d97e1f6..11c52e67b 100644 --- a/wgengine/userspace_ext_test.go +++ b/wgengine/userspace_ext_test.go @@ -7,7 +7,7 @@ package wgengine_test import ( "testing" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/tun" "tailscale.com/net/tstun" "tailscale.com/types/logger" "tailscale.com/wgengine" diff --git a/wgengine/wgcfg/device.go b/wgengine/wgcfg/device.go index 5e0fac71c..b28416216 100644 --- a/wgengine/wgcfg/device.go +++ b/wgengine/wgcfg/device.go @@ -8,7 +8,7 @@ import ( "io" "sort" - "github.com/tailscale/wireguard-go/device" + "golang.zx2c4.com/wireguard/device" "tailscale.com/types/logger" ) diff --git a/wgengine/wgcfg/device_test.go b/wgengine/wgcfg/device_test.go index c3b8ffba4..c9f9c1fe4 100644 --- a/wgengine/wgcfg/device_test.go +++ b/wgengine/wgcfg/device_test.go @@ -16,9 +16,9 @@ import ( "sync" "testing" - "github.com/tailscale/wireguard-go/conn" - "github.com/tailscale/wireguard-go/device" - "github.com/tailscale/wireguard-go/tun" + "golang.zx2c4.com/wireguard/conn" + "golang.zx2c4.com/wireguard/device" + "golang.zx2c4.com/wireguard/tun" "inet.af/netaddr" "tailscale.com/types/wgkey" ) diff --git a/wgengine/wglog/wglog.go b/wgengine/wglog/wglog.go index 59b740ec1..489d250db 100644 --- a/wgengine/wglog/wglog.go +++ b/wgengine/wglog/wglog.go @@ -12,7 +12,7 @@ import ( "sync" "sync/atomic" - "github.com/tailscale/wireguard-go/device" + "golang.zx2c4.com/wireguard/device" "tailscale.com/types/logger" "tailscale.com/types/wgkey" "tailscale.com/wgengine/wgcfg"