webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all: use new AppendEncode methods available in Go 1.22 (#11079)

Browse Source 
Updates #cleanup

Signed-off-by: Joe Tsai <joetsai@digital-static.net>
This commit is contained in:
Joe Tsai
2024-02-08 17:55:03 -08:00
committed by GitHub
parent 94a4f701c2
commit 2e404b769d
4 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/key/util.go
+1 -9
View File
@@ -53,18 +53,10 @@ func clamp25519Private(b []byte) {
func appendHexKey(dst []byte, prefix string, key []byte) []byte {
dst = slices.Grow(dst, len(prefix)+hex.EncodedLen(len(key)))
dst = append(dst, prefix...)
dst = hexAppendEncode(dst, key)
dst = hex.AppendEncode(dst, key)
return dst
}
// TODO(https://go.dev/issue/53693): Use hex.AppendEncode instead.
func hexAppendEncode(dst, src []byte) []byte {
n := hex.EncodedLen(len(src))
dst = slices.Grow(dst, n)
hex.Encode(dst[len(dst):][:n], src)
return dst[:len(dst)+n]
}
// parseHex decodes a key string of the form "<prefix><hex string>"
// into out. The prefix must match, and the decoded base64 must fit
// exactly into out.
types/logid/id.go
+4 -12
View File
@@ -39,7 +39,7 @@ func ParsePrivateID(in string) (out PrivateID, err error) {
}
func (id PrivateID) AppendText(b []byte) ([]byte, error) {
return hexAppendEncode(b, id[:]), nil
return hex.AppendEncode(b, id[:]), nil
}
func (id PrivateID) MarshalText() ([]byte, error) {
@@ -51,7 +51,7 @@ func (id *PrivateID) UnmarshalText(in []byte) error {
}
func (id PrivateID) String() string {
return string(hexAppendEncode(nil, id[:]))
return string(hex.AppendEncode(nil, id[:]))
}
func (id PrivateID) IsZero() bool {
@@ -75,7 +75,7 @@ func ParsePublicID(in string) (out PublicID, err error) {
}
func (id PublicID) AppendText(b []byte) ([]byte, error) {
return hexAppendEncode(b, id[:]), nil
return hex.AppendEncode(b, id[:]), nil
}
func (id PublicID) MarshalText() ([]byte, error) {
@@ -87,7 +87,7 @@ func (id *PublicID) UnmarshalText(in []byte) error {
}
func (id PublicID) String() string {
return string(hexAppendEncode(nil, id[:]))
return string(hex.AppendEncode(nil, id[:]))
}
func (id1 PublicID) Less(id2 PublicID) bool {
@@ -106,14 +106,6 @@ func (id PublicID) Prefix64() uint64 {
return binary.BigEndian.Uint64(id[:8])
}
// TODO(https://go.dev/issue/53693): Use hex.AppendEncode instead.
func hexAppendEncode(dst, src []byte) []byte {
n := hex.EncodedLen(len(src))
dst = slices.Grow(dst, n)
hex.Encode(dst[len(dst):][:n], src)
return dst[:len(dst)+n]
}
func parseID[Bytes []byte | string](funcName string, out *[32]byte, in Bytes) (err error) {
if len(in) != 2*len(out) {
return fmt.Errorf("%s: invalid hex length: %d", funcName, len(in))