Merge branch 'main' into type_cleanup

Author: jschlyter

pyproject.toml

@@ -74,7 +74,7 @@ select = [
     # isort
     "I",
 ]
-ignore = ["E501", "SIM102"]
+ignore = ["E501", "I001", "SIM102", "UP006", "UP035", "UP045", "UP007", "UP038"]
 exclude = ["examples/*"]
 
 [tool.ruff.lint.isort]

src/cryptojwt/jwk/ec.py

@@ -14,12 +14,6 @@
 # This is used to translate between the curve representation in
 # Cryptography and the one used by NIST (and in RFC 7518)
 NIST2SEC = {
-    "B-571": ec.SECT571R1,
-    "K-571": ec.SECT571K1,
-    "K-409": ec.SECT409K1,
-    "K-283": ec.SECT283K1,
-    "K-233": ec.SECT233K1,
-    "K-163": ec.SECT163K1,
     "P-521": ec.SECP521R1,
     "P-384": ec.SECP384R1,
     "P-256": ec.SECP256R1,

tests/570-ec-sect571r1-keypair.pem

@@ -524,7 +524,7 @@ def test_load_pem_file_rsa():
 
 
 def test_load_pem_file_ec():
-    key = ECKey().load(full_path("570-ec-sect571r1-keypair.pem"))
+    key = ECKey().load(full_path("test_keys/ec-p256-private.pem"))
     assert key.has_private_key()
 
 
@@ -540,7 +540,7 @@ def test_key_from_jwk_dict_rsa():
 
 
 def test_key_from_jwk_dict_ec():
-    key = ECKey().load(full_path("570-ec-sect571r1-keypair.pem"))
+    key = ECKey().load(full_path("test_keys/ec-p256-private.pem"))
     assert key.has_private_key()
     jwk = key.serialize(private=True)
     _key = key_from_jwk_dict(jwk)