chore: update go-cose to v1.3.1-rc.1

thomas-fossati · thomas-fossati · commit 25d7afa14b91 · 2024-09-12T14:09:12.000+02:00
Signed-off-by: Thomas Fossati &lt;thomas.fossati@linaro.org&gt;
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/lestrrat-go/jwx/v2 v2.0.8
 	github.com/stretchr/testify v1.8.1
 	github.com/veraison/eat v0.0.0-20220117140849-ddaf59d69f53
-	github.com/veraison/go-cose v1.2.1
+	github.com/veraison/go-cose v1.3.0-rc.1
 	github.com/veraison/psatoken v1.2.1-0.20240719122628-26fe500fd5d4
 )
 
diff --git a/go.sum b/go.sum
@@ -37,8 +37,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/veraison/eat v0.0.0-20220117140849-ddaf59d69f53 h1:5gnX2TrGd/Xz8DOp2OaLtg/jLoIubSUTrgz6iZ58pJ4=
 github.com/veraison/eat v0.0.0-20220117140849-ddaf59d69f53/go.mod h1:+kxt8iuFiVvKRs2VQ1Ho7bbAScXAB/kHFFuP5Biw19I=
-github.com/veraison/go-cose v1.2.1 h1:Gj4x20D0YP79J2+cK3anjGEMwIkg2xX+TKVVGUXwNAc=
-github.com/veraison/go-cose v1.2.1/go.mod h1:t6V8WJzHm1PD5HNsuDjW3KLv577uWb6UTzbZGvdQHD8=
+github.com/veraison/go-cose v1.3.0-rc.1 h1:j7mMBdwkbq4c+pgEZVbbWG8UwVIgGHPp6+TAAYJj+UY=
+github.com/veraison/go-cose v1.3.0-rc.1/go.mod h1:df09OV91aHoQWLmy1KsDdYiagtXgyAwAl8vFeFn1gMc=
 github.com/veraison/psatoken v1.2.1-0.20240719122628-26fe500fd5d4 h1:N7qg7vDF2mUg7I+8AoU+ieJ20cgcShwFHXHkV5b2YAA=
 github.com/veraison/psatoken v1.2.1-0.20240719122628-26fe500fd5d4/go.mod h1:6+WZzXr0ACXYiUAJJqTaCxW43gY2+gEaCoVNdDv3+Bw=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
diff --git a/realm/common.go b/realm/common.go
@@ -78,17 +78,10 @@ func ValidateRealmPubKeyCOSE(b []byte) error {
 		)
 	}
 
-	if k.KeyType != cose.KeyTypeEC2 {
+	if k.Type != cose.KeyTypeEC2 {
 		return fmt.Errorf("%w: realm public key is not EC2", psatoken.ErrWrongSyntax)
 	}
 
-	if err := k.Validate(); err != nil {
-		return fmt.Errorf(
-			"%w: validating EC2 realm public key: %v",
-			psatoken.ErrWrongSyntax, err,
-		)
-	}
-
 	return nil
 }
 
@@ -155,14 +148,10 @@ func ECDSAPublicKeyFromCOSEKey(buf []byte) (*ecdsa.PublicKey, error) {
 		return nil, err
 	}
 
-	if k.KeyType != cose.KeyTypeEC2 {
+	if k.Type != cose.KeyTypeEC2 {
 		return nil, errors.New("key type is not EC2")
 	}
 
-	if err := k.Validate(); err != nil {
-		return nil, err
-	}
-
 	pk, err := k.PublicKey()
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ require (`
`7`	`7`	`github.com/lestrrat-go/jwx/v2 v2.0.8`
`8`	`8`	`github.com/stretchr/testify v1.8.1`
`9`	`9`	`github.com/veraison/eat v0.0.0-20220117140849-ddaf59d69f53`
`10`		`- github.com/veraison/go-cose v1.2.1`
	`10`	`+ github.com/veraison/go-cose v1.3.0-rc.1`
`11`	`11`	`github.com/veraison/psatoken v1.2.1-0.20240719122628-26fe500fd5d4`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -78,17 +78,10 @@ func ValidateRealmPubKeyCOSE(b []byte) error {`
`78`	`78`	`)`
`79`	`79`	`}`
`80`	`80`
`81`		`- if k.KeyType != cose.KeyTypeEC2 {`
	`81`	`+ if k.Type != cose.KeyTypeEC2 {`
`82`	`82`	`return fmt.Errorf("%w: realm public key is not EC2", psatoken.ErrWrongSyntax)`
`83`	`83`	`}`
`84`	`84`
`85`		`- if err := k.Validate(); err != nil {`
`86`		`- return fmt.Errorf(`
`87`		`- "%w: validating EC2 realm public key: %v",`
`88`		`- psatoken.ErrWrongSyntax, err,`
`89`		`- )`
`90`		`- }`
`91`		`-`
`92`	`85`	`return nil`
`93`	`86`	`}`
`94`	`87`
`@@ -155,14 +148,10 @@ func ECDSAPublicKeyFromCOSEKey(buf []byte) (*ecdsa.PublicKey, error) {`
`155`	`148`	`return nil, err`
`156`	`149`	`}`
`157`	`150`
`158`		`- if k.KeyType != cose.KeyTypeEC2 {`
	`151`	`+ if k.Type != cose.KeyTypeEC2 {`
`159`	`152`	`return nil, errors.New("key type is not EC2")`
`160`	`153`	`}`
`161`	`154`
`162`		`- if err := k.Validate(); err != nil {`
`163`		`- return nil, err`
`164`		`- }`
`165`		`-`
`166`	`155`	`pk, err := k.PublicKey()`
`167`	`156`	`if err != nil {`
`168`	`157`	`return nil, err`