From a3aa9282332dfcdeb7f0bd3f6cc9da9561596ef8 Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Tue, 5 Aug 2025 16:14:59 +0300 Subject: [PATCH] all: simplify slice to array conversions Signed-off-by: Oleksandr Redko --- feature/tpm/tpm.go | 2 +- net/tsaddr/tsaddr.go | 2 +- util/deephash/deephash_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/feature/tpm/tpm.go b/feature/tpm/tpm.go index 8df269b95..c4b6db13d 100644 --- a/feature/tpm/tpm.go +++ b/feature/tpm/tpm.go @@ -353,7 +353,7 @@ func unseal(logf logger.Logf, data encryptedData) (*decryptedData, error) { } return &decryptedData{ - Key: *(*[32]byte)(unsealedKey), + Key: [32]byte(unsealedKey), Data: unsealedData, }, nil } diff --git a/net/tsaddr/tsaddr.go b/net/tsaddr/tsaddr.go index 06e6a26dd..2975f3f91 100644 --- a/net/tsaddr/tsaddr.go +++ b/net/tsaddr/tsaddr.go @@ -299,7 +299,7 @@ func IsViaPrefix(p netip.Prefix) bool { func UnmapVia(ip netip.Addr) netip.Addr { if TailscaleViaRange().Contains(ip) { a := ip.As16() - return netip.AddrFrom4(*(*[4]byte)(a[12:16])) + return netip.AddrFrom4([4]byte(a[12:16])) } return ip } diff --git a/util/deephash/deephash_test.go b/util/deephash/deephash_test.go index 413893ff9..29214322d 100644 --- a/util/deephash/deephash_test.go +++ b/util/deephash/deephash_test.go @@ -915,8 +915,8 @@ func FuzzAddr(f *testing.F) { binary.LittleEndian.PutUint64(b2[8:], u2b) var ips [4]netip.Addr - ips[0] = netip.AddrFrom4(*(*[4]byte)(b1[:])) - ips[1] = netip.AddrFrom4(*(*[4]byte)(b2[:])) + ips[0] = netip.AddrFrom4([4]byte(b1[:])) + ips[1] = netip.AddrFrom4([4]byte(b2[:])) ips[2] = netip.AddrFrom16(b1) if zone1 != "" { ips[2] = ips[2].WithZone(zone1)