summaryrefslogtreecommitdiffhomepage
path: root/tsnet
diff options
context:
space:
mode:
Diffstat (limited to 'tsnet')
-rw-r--r--tsnet/depaware.txt37
-rw-r--r--tsnet/tsnet_test.go2
2 files changed, 22 insertions, 17 deletions
diff --git a/tsnet/depaware.txt b/tsnet/depaware.txt
index b61545d24..cb6b6996b 100644
--- a/tsnet/depaware.txt
+++ b/tsnet/depaware.txt
@@ -1,5 +1,6 @@
tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
+ 💣 crypto/internal/entropy/v1.0.0 from crypto/internal/fips140/drbg
filippo.io/edwards25519 from github.com/hdevalence/ed25519consensus
filippo.io/edwards25519/field from filippo.io/edwards25519
W 💣 github.com/alexbrainman/sspi from github.com/alexbrainman/sspi/internal/common+
@@ -441,7 +442,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
golang.org/x/text/unicode/norm from golang.org/x/net/idna
golang.org/x/time/rate from gvisor.dev/gvisor/pkg/log+
vendor/golang.org/x/crypto/chacha20 from vendor/golang.org/x/crypto/chacha20poly1305
- vendor/golang.org/x/crypto/chacha20poly1305 from crypto/internal/hpke+
+ vendor/golang.org/x/crypto/chacha20poly1305 from crypto/hpke+
vendor/golang.org/x/crypto/cryptobyte from crypto/ecdsa+
vendor/golang.org/x/crypto/cryptobyte/asn1 from crypto/ecdsa+
vendor/golang.org/x/crypto/internal/alias from vendor/golang.org/x/crypto/chacha20+
@@ -466,7 +467,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
container/list from crypto/tls+
context from crypto/tls+
crypto from crypto/ecdh+
- crypto/aes from crypto/internal/hpke+
+ crypto/aes from crypto/tls+
crypto/cipher from crypto/aes+
crypto/des from crypto/tls+
crypto/dsa from crypto/x509+
@@ -475,12 +476,13 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
crypto/ed25519 from crypto/tls+
crypto/elliptic from crypto/ecdsa+
crypto/fips140 from crypto/tls/internal/fips140tls+
- crypto/hkdf from crypto/internal/hpke+
+ crypto/hkdf from crypto/hpke+
crypto/hmac from crypto/tls+
+ crypto/hpke from crypto/tls
crypto/internal/boring from crypto/aes+
crypto/internal/boring/bbig from crypto/ecdsa+
crypto/internal/boring/sig from crypto/internal/boring
- crypto/internal/entropy from crypto/internal/fips140/drbg
+ crypto/internal/constanttime from crypto/internal/fips140/edwards25519+
crypto/internal/fips140 from crypto/internal/fips140/aes+
crypto/internal/fips140/aes from crypto/aes+
crypto/internal/fips140/aes/gcm from crypto/cipher+
@@ -495,7 +497,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
crypto/internal/fips140/edwards25519/field from crypto/ecdh+
crypto/internal/fips140/hkdf from crypto/internal/fips140/tls13+
crypto/internal/fips140/hmac from crypto/hmac+
- crypto/internal/fips140/mlkem from crypto/tls+
+ crypto/internal/fips140/mlkem from crypto/mlkem
crypto/internal/fips140/nistec from crypto/elliptic+
crypto/internal/fips140/nistec/fiat from crypto/internal/fips140/nistec
crypto/internal/fips140/rsa from crypto/rsa
@@ -509,20 +511,21 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
crypto/internal/fips140deps/byteorder from crypto/internal/fips140/aes+
crypto/internal/fips140deps/cpu from crypto/internal/fips140/aes+
crypto/internal/fips140deps/godebug from crypto/internal/fips140+
+ crypto/internal/fips140deps/time from crypto/internal/entropy/v1.0.0
crypto/internal/fips140hash from crypto/ecdsa+
crypto/internal/fips140only from crypto/cipher+
- crypto/internal/hpke from crypto/tls
crypto/internal/impl from crypto/internal/fips140/aes+
- crypto/internal/randutil from crypto/dsa+
- crypto/internal/sysrand from crypto/internal/entropy+
+ crypto/internal/rand from crypto/dsa+
+ crypto/internal/randutil from crypto/internal/rand
+ crypto/internal/sysrand from crypto/internal/fips140/drbg
crypto/md5 from crypto/tls+
- LD crypto/mlkem from golang.org/x/crypto/ssh
+ crypto/mlkem from golang.org/x/crypto/ssh+
crypto/rand from crypto/ed25519+
crypto/rc4 from crypto/tls+
crypto/rsa from crypto/tls+
crypto/sha1 from crypto/tls+
crypto/sha256 from crypto/tls+
- crypto/sha3 from crypto/internal/fips140hash
+ crypto/sha3 from crypto/internal/fips140hash+
crypto/sha512 from crypto/ecdsa+
crypto/subtle from crypto/cipher+
crypto/tls from github.com/prometheus-community/pro-bing+
@@ -566,9 +569,8 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
internal/goarch from crypto/internal/fips140deps/cpu+
internal/godebug from crypto/internal/fips140deps/godebug+
internal/godebugs from internal/godebug+
- internal/goexperiment from hash/maphash+
+ internal/goexperiment from net/http/pprof+
internal/goos from crypto/x509+
- internal/itoa from internal/poll+
internal/msan from internal/runtime/maps+
internal/nettrace from net+
internal/oserror from io/fs+
@@ -581,14 +583,17 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
internal/runtime/atomic from internal/runtime/exithook+
LA internal/runtime/cgroup from runtime
internal/runtime/exithook from runtime
- internal/runtime/gc from runtime
+ internal/runtime/gc from runtime+
+ internal/runtime/gc/scan from runtime
internal/runtime/maps from reflect+
internal/runtime/math from internal/runtime/maps+
- internal/runtime/strconv from internal/runtime/cgroup+
+ internal/runtime/pprof/label from runtime+
internal/runtime/sys from crypto/subtle+
- LA internal/runtime/syscall from runtime+
+ LA internal/runtime/syscall/linux from internal/runtime/cgroup+
+ W internal/runtime/syscall/windows from internal/syscall/windows+
internal/saferio from debug/pe+
internal/singleflight from net
+ internal/strconv from internal/poll+
internal/stringslite from embed+
internal/sync from sync+
internal/synctest from sync
@@ -631,7 +636,7 @@ tailscale.com/tsnet dependencies: (generated by github.com/tailscale/depaware)
os/user from github.com/godbus/dbus/v5+
path from debug/dwarf+
path/filepath from crypto/x509+
- reflect from crypto/x509+
+ reflect from database/sql/driver+
regexp from github.com/huin/goupnp/httpu+
regexp/syntax from regexp
runtime from crypto/internal/fips140+
diff --git a/tsnet/tsnet_test.go b/tsnet/tsnet_test.go
index 266a60f78..1cf4bf48f 100644
--- a/tsnet/tsnet_test.go
+++ b/tsnet/tsnet_test.go
@@ -445,7 +445,7 @@ func TestConn(t *testing.T) {
for {
c, err := ln.Accept()
if err != nil {
- if ctx.Err() != nil {
+ if ctx.Err() != nil || errors.Is(err, net.ErrClosed) {
return
}
t.Errorf("s1.Accept: %v", err)