Remove alg parameter from RecipientInterface.apply().

dajiaji · Jun 24, 2021 · c424492 · c424492
1 parent afdcb7a
commit c424492
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,8 @@ Changes
 Unreleased
 ----------
 
+- Remove alg parameter from RecipientInterface.apply(). `#141 <https://github.com/dajiaji/python-cwt/pull/141>`__
+
 Version 1.0.0
 --------------
 

diff --git a/cwt/recipient_algs/aes_key_wrap.py b/cwt/recipient_algs/aes_key_wrap.py
@@ -39,7 +39,6 @@ def apply(
         self,
         key: Optional[COSEKeyInterface] = None,
         recipient_key: Optional[COSEKeyInterface] = None,
-        alg: Optional[int] = None,
         context: Optional[Union[List[Any], Dict[str, Any]]] = None,
     ) -> COSEKeyInterface:
         if not key:

diff --git a/cwt/recipient_algs/direct_hkdf.py b/cwt/recipient_algs/direct_hkdf.py
@@ -80,7 +80,6 @@ def apply(
         self,
         key: Optional[COSEKeyInterface] = None,
         recipient_key: Optional[COSEKeyInterface] = None,
-        alg: Optional[int] = None,
         context: Optional[Union[List[Any], Dict[str, Any]]] = None,
     ) -> COSEKeyInterface:
 

diff --git a/cwt/recipient_algs/direct_key.py b/cwt/recipient_algs/direct_key.py
@@ -21,7 +21,6 @@ def apply(
         self,
         key: Optional[COSEKeyInterface] = None,
         recipient_key: Optional[COSEKeyInterface] = None,
-        alg: Optional[int] = None,
         context: Optional[Union[List[Any], Dict[str, Any]]] = None,
     ) -> COSEKeyInterface:
         if not key:

diff --git a/cwt/recipient_algs/ecdh_aes_key_wrap.py b/cwt/recipient_algs/ecdh_aes_key_wrap.py
@@ -53,7 +53,6 @@ def apply(
         self,
         key: Optional[COSEKeyInterface] = None,
         recipient_key: Optional[COSEKeyInterface] = None,
-        alg: Optional[int] = None,
         context: Optional[Union[List[Any], Dict[str, Any]]] = None,
     ) -> COSEKeyInterface:
 

diff --git a/cwt/recipient_algs/ecdh_direct_hkdf.py b/cwt/recipient_algs/ecdh_direct_hkdf.py
@@ -50,7 +50,6 @@ def apply(
         self,
         key: Optional[COSEKeyInterface] = None,
         recipient_key: Optional[COSEKeyInterface] = None,
-        alg: Optional[int] = None,
         context: Optional[Union[List[Any], Dict[str, Any]]] = None,
     ) -> COSEKeyInterface:
 

diff --git a/cwt/recipient_interface.py b/cwt/recipient_interface.py
@@ -144,7 +144,6 @@ def apply(
         self,
         key: Optional[COSEKeyInterface] = None,
         recipient_key: Optional[COSEKeyInterface] = None,
-        alg: Optional[int] = None,
         context: Optional[Union[List[Any], Dict[str, Any]]] = None,
     ) -> COSEKeyInterface:
         """
@@ -162,7 +161,6 @@ def apply(
                 be used for preparing the key.
             recipient_key (Optional[COSEKeyInterface]): The external public
                 key provided by the recipient used for ECDH key agreement.
-            alg (Optional[int]): The algorithm of the key to be generated.
             context (Optional[Union[List[Any], Dict[str, Any]]]): Context
                 information structure.
         Returns:

diff --git a/tests/test_recipient_algs_aes_key_wrap.py b/tests/test_recipient_algs_aes_key_wrap.py
@@ -116,7 +116,7 @@ def test_aes_key_wrap_apply_with_invalid_key(self):
             {1: -3}, {}, sender_key=COSEKey.from_symmetric_key(alg="A128KW")
         )
         with pytest.raises(EncodeError) as err:
-            ctx.apply(key, alg="A128GCM")
+            ctx.apply(key, context={"alg": "A128GCM"})
             pytest.fail("apply() should fail.")
         assert "Failed to wrap key." in str(err.value)