Fix after rebase

lestrrat-go · Feb 19, 2024 · 4566c17 · 4566c17
1 parent 9e12366
commit 4566c17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/jwk/ecdsa.go b/jwk/ecdsa.go
@@ -228,9 +228,9 @@ func ecdsaValidateKey(k interface {
 	X() []byte
 	Y() []byte
 }, checkPrivate bool) error {
-	crv, ok := ecutil.CurveForAlgorithm(k.Crv())
-	if !ok {
-		return fmt.Errorf(`invalid curve algorithm %q`, k.Crv())
+	crv, err := ourecdsa.CurveFromAlgorithm(k.Crv())
+	if err != nil {
+		return fmt.Errorf(`invalid curve algorithm %q: %w`, k.Crv(), err)
 	}
 
 	keySize := ecutil.CalculateKeySize(crv)

diff --git a/jws/BUILD.bazel b/jws/BUILD.bazel
@@ -24,11 +24,7 @@ go_library(
     deps = [
         "//cert",
         "//internal/base64",
-<<<<<<< HEAD
         "//internal/ecutil",
-        "//internal/iter",
-=======
->>>>>>> 7497448 (Remove iterators  (#999))
         "//internal/json",
         "//internal/keyconv",
         "//internal/pool",