Skip to content

Commit 3615fe8

Browse files
committed
Remove one more union
1 parent 909fbdd commit 3615fe8

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

src/cryptojwt/jwk/okp.py

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from typing import Union
2-
31
from cryptography.hazmat.primitives import serialization
42
from cryptography.hazmat.primitives.asymmetric import ed448, ed25519, x448, x25519
53

@@ -14,12 +12,16 @@
1412
import_public_key_from_pem_file,
1513
)
1614

17-
OKPPublicKey = Union[
18-
ed25519.Ed25519PublicKey, ed448.Ed448PublicKey, x25519.X25519PublicKey, x448.X448PublicKey
19-
]
20-
OKPPrivateKey = Union[
21-
ed25519.Ed25519PrivateKey, ed448.Ed448PrivateKey, x25519.X25519PrivateKey, x448.X448PrivateKey
22-
]
15+
OKPPublicKey = (
16+
ed25519.Ed25519PublicKey | ed448.Ed448PublicKey | x25519.X25519PublicKey | x448.X448PublicKey
17+
)
18+
19+
OKPPrivateKey = (
20+
ed25519.Ed25519PrivateKey
21+
| ed448.Ed448PrivateKey
22+
| x25519.X25519PrivateKey
23+
| x448.X448PrivateKey
24+
)
2325

2426
OKP_CRV2PUBLIC = {
2527
"Ed25519": ed25519.Ed25519PublicKey,
@@ -155,7 +157,8 @@ def deserialize(self):
155157
def _serialize_public(self, key):
156158
self.x = b64e(
157159
key.public_bytes(
158-
encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw
160+
encoding=serialization.Encoding.Raw,
161+
format=serialization.PublicFormat.Raw,
159162
)
160163
).decode("ascii")
161164

@@ -304,9 +307,11 @@ def cmp_keys(a, b, key_type):
304307
return False
305308
else:
306309
if a.public_bytes(
307-
encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw
310+
encoding=serialization.Encoding.Raw,
311+
format=serialization.PublicFormat.Raw,
308312
) != b.public_bytes(
309-
encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw
313+
encoding=serialization.Encoding.Raw,
314+
format=serialization.PublicFormat.Raw,
310315
):
311316
return False
312317
return True

0 commit comments

Comments
 (0)