Simplify with keyword-only arguments

Author: Legrandin

lib/Crypto/Protocol/HPKE.py

@@ -2,7 +2,7 @@
 from enum import IntEnum
 
 from types import ModuleType
-from typing import Optional, TypedDict, NotRequired, Unpack
+from typing import Optional
 
 from .KDF import _HKDF_extract, _HKDF_expand
 from .DH import key_agreement, import_x25519_public_key, import_x448_public_key
@@ -363,16 +363,12 @@ def unseal(self, ciphertext: bytes, auth_data: Optional[bytes] = None):
         return pt
 
 
-class RequestParams(TypedDict):
-    enc: NotRequired[bytes]
-    sender_key: NotRequired[EccKey]
-    psk: NotRequired[tuple[bytes, bytes]]
-    info: NotRequired[bytes]
-
-
-def new(receiver_key: EccKey,
+def new(*, receiver_key: EccKey,
         aead_id: AEAD,
-        **kwargs: Unpack[RequestParams]):
+        enc: Optional[bytes] = None,
+        sender_key: Optional[EccKey] = None,
+        psk: Optional[tuple[bytes, bytes]] = None,
+        info: bytes = b''):
     """Create an HPKE context which can be used
     by the sender to seal (encrypt) a message
     or by the receiver to unseal (decrypt) it.
@@ -440,14 +436,6 @@ def new(receiver_key: EccKey,
     .. _HPKE: https://datatracker.ietf.org/doc/rfc9180/
     """
 
-    sender_key = kwargs.pop('sender_key', None)
-    psk = kwargs.pop('psk', None)
-    info = kwargs.pop('info', b'')
-    enc = kwargs.pop('enc', None)
-
-    if kwargs:
-        raise ValueError(f"Unknown parameters: {list(kwargs.keys())}")
-
     if aead_id not in AEAD:
         raise ValueError(f"Unknown AEAD cipher ID {aead_id:#x}")
 

lib/Crypto/SelfTest/Protocol/__init__.py

@@ -33,7 +33,7 @@ def get_tests(config={}):
     from Crypto.SelfTest.Protocol import test_SecretSharing
     tests += test_SecretSharing.get_tests(config=config)
 
-    if sys.version_info >= (3, 11):
+    if sys.version_info >= (3, 9):
         from Crypto.SelfTest.Protocol import test_HPKE
         tests += test_HPKE.get_tests(config=config)