diff --git a/go.mod b/go.mod index 73fcb65..ffdb42e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/tillitis/tkeyclient go 1.23.0 require ( - github.com/ccoveille/go-safecast v1.1.0 + github.com/ccoveille/go-safecast/v2 v2.0.0 go.bug.st/serial v1.6.2 golang.org/x/crypto v0.40.0 ) diff --git a/go.sum b/go.sum index 480f084..dbbb24a 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/ccoveille/go-safecast v1.1.0 h1:iHKNWaZm+OznO7Eh6EljXPjGfGQsSfa6/sxPlIEKO+g= -github.com/ccoveille/go-safecast v1.1.0/go.mod h1:QqwNjxQ7DAqY0C721OIO9InMk9zCwcsO7tnRuHytad8= +github.com/ccoveille/go-safecast/v2 v2.0.0 h1:+5eyITXAUj3wMjad6cRVJKGnC7vDS55zk0INzJagub0= +github.com/ccoveille/go-safecast/v2 v2.0.0/go.mod h1:JIYA4CAR33blIDuE6fSwCp2sz1oOBahXnvmdBhOAABs= github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0= github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/tkeyclient.go b/tkeyclient.go index fefdcc6..f68d896 100644 --- a/tkeyclient.go +++ b/tkeyclient.go @@ -35,7 +35,7 @@ import ( "os" "time" - "github.com/ccoveille/go-safecast" + "github.com/ccoveille/go-safecast/v2" "go.bug.st/serial" "golang.org/x/crypto/blake2s" ) @@ -218,22 +218,22 @@ func (u *UDI) Unpack(raw []byte) error { var err error vpr := binary.LittleEndian.Uint32(raw[0:4]) - u.Unnamed, err = safecast.ToUint8((vpr >> 28) & 0xf) + u.Unnamed, err = safecast.Convert[uint8]((vpr >> 28) & 0xf) if err != nil { return fmt.Errorf("%w", err) } - u.VendorID, err = safecast.ToUint16((vpr >> 12) & 0xffff) + u.VendorID, err = safecast.Convert[uint16]((vpr >> 12) & 0xffff) if err != nil { return fmt.Errorf("%w", err) } - u.ProductID, err = safecast.ToUint8((vpr >> 6) & 0x3f) + u.ProductID, err = safecast.Convert[uint8]((vpr >> 6) & 0x3f) if err != nil { return fmt.Errorf("%w", err) } - u.ProductRevision, err = safecast.ToUint8(vpr & 0x3f) + u.ProductRevision, err = safecast.Convert[uint8](vpr & 0x3f) if err != nil { return fmt.Errorf("%w", err) }