refactor: format long lines and improve type hints in COSE/HPKE code

Author: dajiaji

cwt/algs/ec2.py

@@ -83,7 +83,9 @@ def __init__(self, params: Dict[int, Any]):
                 self._key_ops = [2]
         if self._alg:
             # Validate alg for EC2 curve.
-            if self._crv == 1 and self._alg not in ([-7, -9, 35, 45, 46, 53] + list(COSE_ALGORITHMS_CKDM_KEY_AGREEMENT.values())):
+            if self._crv == 1 and self._alg not in (
+                [-7, -9, 35, 45, 46, 53] + list(COSE_ALGORITHMS_CKDM_KEY_AGREEMENT.values())
+            ):
                 raise ValueError(f"Unsupported or unknown alg used with P-256: {self._alg}.")
             elif self._crv == 2 and self._alg not in ([-35, -51, 37, 47] + list(COSE_ALGORITHMS_CKDM_KEY_AGREEMENT.values())):
                 raise ValueError(f"Unsupported or unknown alg used with P-384: {self._alg}.")

cwt/cose.py

@@ -350,7 +350,9 @@ def decode(
             DecodeError: Failed to decode data.
             VerifyError: Failed to verify data.
         """
-        _, _, res = self.decode_with_headers(data, keys, context, external_aad, detached_payload, enable_non_aead, hpke_psk, hpke_info, hpke_aad, extra_info)
+        _, _, res = self.decode_with_headers(
+            data, keys, context, external_aad, detached_payload, enable_non_aead, hpke_psk, hpke_info, hpke_aad, extra_info
+        )
         return res
 
     def decode_with_headers(
@@ -365,7 +367,7 @@ def decode_with_headers(
         hpke_info: bytes = b"",
         hpke_aad: bytes = b"",
         extra_info: bytes = b"",
-    ) -> Tuple[Dict[int, Any], Dict[int, Any], bytes]:
+    ) -> Tuple[Dict[Union[str, int], Any], Dict[Union[str, int], Any], bytes]:
         """
         Verifies and decodes COSE data, and returns protected headers, unprotected headers and payload.
 
@@ -490,7 +492,9 @@ def decode_with_headers(
 
         # Encrypt
         if data.tag == 96:
-            rs = Recipients.from_list(data.value[3], self._verify_kid, context, hpke_psk=hpke_psk, extra_info=extra_info, hpke_aad=hpke_aad)
+            rs = Recipients.from_list(
+                data.value[3], self._verify_kid, context, hpke_psk=hpke_psk, extra_info=extra_info, hpke_aad=hpke_aad
+            )
             nonce = u.get(5, b"")
             enc_key = rs.derive_key(keys, alg, external_aad, "Enc_Recipient")
             aad = self._dumps(["Encrypt", data.value[0], external_aad])

cwt/recipient.py

@@ -135,14 +135,31 @@ def from_list(
         if not isinstance(recipient[2], bytes):
             raise ValueError("ciphertext should be bytes.")
         if len(recipient) == 3:
-            rec = cls.new(protected, recipient[1], recipient[2], hpke_psk=hpke_psk, context=context, extra_info=extra_info, hpke_aad=hpke_aad)
+            rec = cls.new(
+                protected,
+                recipient[1],
+                recipient[2],
+                hpke_psk=hpke_psk,
+                context=context,
+                extra_info=extra_info,
+                hpke_aad=hpke_aad,
+            )
             rec._set_b_protected(recipient[0])
             return rec
         if not isinstance(recipient[3], list):
             raise ValueError("recipients should be list.")
         recipients: List[RecipientInterface] = []
         for r in recipient[3]:
             recipients.append(cls.from_list(r, hpke_psk=hpke_psk, extra_info=extra_info, hpke_aad=hpke_aad))
-        rec = cls.new(protected, recipient[1], recipient[2], recipients, hpke_psk=hpke_psk, context=context, extra_info=extra_info, hpke_aad=hpke_aad)
+        rec = cls.new(
+            protected,
+            recipient[1],
+            recipient[2],
+            recipients,
+            hpke_psk=hpke_psk,
+            context=context,
+            extra_info=extra_info,
+            hpke_aad=hpke_aad,
+        )
         rec._set_b_protected(recipient[0])
         return rec

tests/test_cose_hpke.py

@@ -10,7 +10,15 @@
 import cbor2
 import pytest
 
-from cwt import COSE, COSEAlgs, COSEHeaders, COSEKey, DecodeError, EncodeError, Recipient
+from cwt import (
+    COSE,
+    COSEAlgs,
+    COSEHeaders,
+    COSEKey,
+    DecodeError,
+    EncodeError,
+    Recipient,
+)
 
 
 class TestCOSE_HPKE:

tests/test_cose_hpke_vectors.py

@@ -5,7 +5,6 @@
 
 from cwt import COSE, COSEKey
 
-
 # --- KE vectors (COSE_Encrypt, tag 96) ---
 
 # HPKE-0-KE private key
@@ -1178,9 +1177,7 @@ def test_ke_vector(self, key_hex, ct_hex, external_aad, extra_info, hpke_aad, re
             pytest.xfail("draft-ietf-cose-hpke-23 X448 (HPKE-5/6) KE test vectors appear incorrect")
         key = COSEKey.new(cbor2.loads(bytes.fromhex(key_hex)))
         ct = bytes.fromhex(ct_hex)
-        result = COSE.new().decode(
-            ct, key, external_aad=external_aad, extra_info=extra_info, hpke_aad=hpke_aad
-        )
+        result = COSE.new().decode(ct, key, external_aad=external_aad, extra_info=extra_info, hpke_aad=hpke_aad)
         assert result == b"hpke test payload"