Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ jobs:
run: |
pip install poetry
poetry config virtualenvs.in-project true
- name: Python 3.10 workaround
run: poetry config experimental.new-installer false
- name: Install dependencies
run: poetry install
- name: Run pytest
Expand Down
2 changes: 2 additions & 0 deletions src/cryptojwt/jwk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def __init__(
"RS384",
"RS512",
"ES256",
"ES256K",
"ES384",
"ES512",
"PS256",
Expand All @@ -86,6 +87,7 @@ def __init__(
"RS384",
"RS512",
"ES256",
"ES256K",
"ES384",
"ES512",
"PS256",
Expand Down
1 change: 1 addition & 0 deletions src/cryptojwt/jwk/ec.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"P-256": ec.SECP256R1,
"P-224": ec.SECP224R1,
"P-192": ec.SECP192R1,
"P-256K": ec.SECP256K1,
}

# Inverted NIST2SEC dictionary
Expand Down
3 changes: 3 additions & 0 deletions src/cryptojwt/jws/dsa.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ def __init__(self, algorithm="ES256"):
if algorithm == "ES256":
self.hash_algorithm = hashes.SHA256
self.curve_name = "secp256r1"
elif algorithm == "ES256K":
self.hash_algorithm = hashes.SHA256
self.curve_name = "secp256k1"
elif algorithm == "ES384":
self.hash_algorithm = hashes.SHA384
self.curve_name = "secp384r1"
Expand Down
1 change: 1 addition & 0 deletions src/cryptojwt/jws/jws.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"RS384": RSASigner("RS384"),
"RS512": RSASigner("RS512"),
"ES256": ECDSASigner("ES256"),
"ES256K": ECDSASigner("ES256K"),
"ES384": ECDSASigner("ES384"),
"ES512": ECDSASigner("ES512"),
"PS256": PSSSigner("SHA256"),
Expand Down
2 changes: 2 additions & 0 deletions src/cryptojwt/key_bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -1364,6 +1364,8 @@ def key_by_alg(alg: str):
elif alg.startswith("ES"):
if alg == "ES256":
return key_gen("EC", crv="P-256")
elif alg == "ES256K":
return key_gen("EC", crv="P-256K")
elif alg == "ES384":
return key_gen("EC", crv="P-384")
elif alg == "ES512":
Expand Down
7 changes: 6 additions & 1 deletion tests/test_06_jws.py
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,12 @@ def test_jws_mm():

@pytest.mark.parametrize(
"ec_func,alg",
[(ec.SECP256R1, "ES256"), (ec.SECP384R1, "ES384"), (ec.SECP521R1, "ES512")],
[
(ec.SECP256R1, "ES256"),
(ec.SECP384R1, "ES384"),
(ec.SECP521R1, "ES512"),
(ec.SECP256K1, "ES256K"),
],
)
def test_signer_es(ec_func, alg):
payload = "Please take a moment to register today"
Expand Down
4 changes: 4 additions & 0 deletions tests/test_09_jwt.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ def test_msg_cls():
{"type": "RSA", "use": ["sig"]},
{"type": "RSA", "use": ["enc"]},
{"type": "EC", "crv": "P-256", "use": ["sig"]},
{"type": "EC", "crv": "P-256K", "use": ["sig"]},
{"type": "EC", "crv": "P-384", "use": ["sig"]},
]

Expand All @@ -230,6 +231,9 @@ def test_pick_key():
_k = pick_key(keys, "sig", "ES384")
assert len(_k) == 1

_k = pick_key(keys, "sig", "ES256K")
assert len(_k) == 1

_k = pick_key(keys, "enc", "RSA-OAEP-256")
assert len(_k) == 1

Expand Down