From 58f828eb7c5c08137aa700b63ce6021b249dc592 Mon Sep 17 00:00:00 2001 From: james pickett Date: Fri, 12 Apr 2024 13:03:57 -0700 Subject: [PATCH] more linting (kill me) --- go.mod | 4 ++-- go.sum | 4 ++++ pkg/secureenclave/secureenclave.go | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index c93b134..c0ee8d2 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/kolide/kit v0.0.0-20221107170827-fb85e3d59eab github.com/stretchr/testify v1.8.0 github.com/vmihailenco/msgpack/v5 v5.3.5 - golang.org/x/crypto v0.17.0 + golang.org/x/crypto v0.22.0 ) require ( @@ -16,6 +16,6 @@ require ( github.com/oklog/ulid v1.3.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/sys v0.19.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 579673b..582143a 100644 --- a/go.sum +++ b/go.sum @@ -162,6 +162,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -196,6 +198,8 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210629170331-7dc0b73dc9fb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/pkg/secureenclave/secureenclave.go b/pkg/secureenclave/secureenclave.go index 0991f51..20c9643 100644 --- a/pkg/secureenclave/secureenclave.go +++ b/pkg/secureenclave/secureenclave.go @@ -133,6 +133,9 @@ func findKey(publicKeySha1 []byte) (*ecdsa.PublicKey, error) { func rawToEcdsa(raw []byte) *ecdsa.PublicKey { ecKey := new(ecdsa.PublicKey) ecKey.Curve = elliptic.P256() + // lint here suggestest using ecdh package, but we are using ecdsa key through out the code + // have found a straight forward to go from ecdh.P256().NewPublicKey(raw) -> ecdsa.PublicKey + //nolint:staticcheck ecKey.X, ecKey.Y = elliptic.Unmarshal(ecKey.Curve, raw) return ecKey } @@ -142,6 +145,9 @@ func publicKeyLookUpHash(key *ecdsa.PublicKey) ([]byte, error) { return nil, errors.New("public key has nil XY coordinates") } + // lint here suggestest using ecdh package, but we are using ecdsa key through out the code + // have found a straight forward to go from ecdh.P256().NewPublicKey(raw) -> ecdsa.PublicKey + //nolint:staticcheck keyBytes := elliptic.Marshal(elliptic.P256(), key.X, key.Y) hash := sha1.New() hash.Write(keyBytes)