From 4566c177e6798acd98a188eb6309ce5a6343f7c4 Mon Sep 17 00:00:00 2001
From: Daisuke Maki <lestrrat+github@gmail.com>
Date: Fri, 27 Oct 2023 15:23:07 +0900
Subject: [PATCH] Fix after rebase

---
 jwk/ecdsa.go    | 6 +++---
 jws/BUILD.bazel | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/jwk/ecdsa.go b/jwk/ecdsa.go
index 7af943382..fdf6e3363 100644
--- 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
index 995344a30..34ee8a96d 100644
--- 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",