derivepassphrase.git

@@ -651,7 +651,7 @@ class SSHKeyCommentPair(NamedTuple, Generic[T_Buffer]):

         )

-class SSH_AGENTC(enum.Enum):  # noqa: N801

+class SSH_AGENTC(int, enum.Enum):  # noqa: N801

     """SSH agent protocol numbers: client requests.

     Attributes:

@@ -688,7 +688,7 @@ class SSH_AGENTC(enum.Enum):  # noqa: N801

     """"""

-class SSH_AGENT(enum.Enum):  # noqa: N801

+class SSH_AGENT(int, enum.Enum):  # noqa: N801

     """SSH agent protocol numbers: server replies.

     Attributes:

@@ -66,7 +66,7 @@ class SSHAgentFailedError(RuntimeError):

         # TODO(the-13th-letter): Rewrite using structural pattern matching.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

         if self.args == (  # pragma: no branch

-            _types.SSH_AGENT.FAILURE.value,

+            _types.SSH_AGENT.FAILURE,

             b"",

         ):

             return "The SSH agent failed to complete the request"

@@ -539,14 +539,8 @@ class SSHAgentClient:

                 any of them.

         """

-        if isinstance(  # pragma: no branch

-            response_code, (int, _types.SSH_AGENT)

-        ):

+        if isinstance(response_code, int):  # pragma: no branch

             response_code = frozenset({response_code})

-        if response_code is not None:  # pragma: no branch

-            response_code = frozenset({

-                c if isinstance(c, int) else c.value for c in response_code

-            })

         payload = memoryview(payload)

         request_message = bytearray([

             code if isinstance(code, int) else code.value

@@ -679,7 +673,7 @@ class SSHAgentClient:

         return bytes(

             self.unstring(

                 self.request(

-                    _types.SSH_AGENTC.SIGN_REQUEST.value,

+                    _types.SSH_AGENTC.SIGN_REQUEST,

                     request_data,

                     response_code=_types.SSH_AGENT.SIGN_RESPONSE,

                 )

@@ -384,7 +384,7 @@ class StubbedSSHAgentSocket:

         try:

             self.parse_client_request_and_dispatch()

         except ValueError:

-            payload = int.to_bytes(_types.SSH_AGENT.FAILURE.value, 1, "big")

+            payload = int.to_bytes(_types.SSH_AGENT.FAILURE, 1, "big")

             self.send_to_client.extend(int.to_bytes(len(payload), 4, "big"))

             self.send_to_client.extend(payload)

         finally:

@@ -490,7 +490,7 @@ class StubbedSSHAgentSocket:

             iterable of 8-bit integers.

         """

-        yield _types.SSH_AGENT.EXTENSION_RESPONSE.value

+        yield _types.SSH_AGENT.EXTENSION_RESPONSE

         yield from ssh_agent.SSHAgentClient.string(b"query")

         extension_answers = [

             b"query",

@@ -518,9 +518,9 @@ class StubbedSSHAgentSocket:

         """

         if list_extended:

-            yield _types.SSH_AGENT.SUCCESS.value

+            yield _types.SSH_AGENT.SUCCESS

         else:

-            yield _types.SSH_AGENT.IDENTITIES_ANSWER.value

+            yield _types.SSH_AGENT.IDENTITIES_ANSWER

         signature_classes = [

             tests.data.SSHTestKeyDeterministicSignatureClass.SPEC,

         ]

@@ -576,13 +576,13 @@ class StubbedSSHAgentSocket:

             if key.public_key_data == key_blob:

                 if spec in key.expected_signatures:

                     return int.to_bytes(

-                        _types.SSH_AGENT.SIGN_RESPONSE.value, 1, "big"

+                        _types.SSH_AGENT.SIGN_RESPONSE, 1, "big"

                     ) + ssh_agent.SSHAgentClient.string(

                         key.expected_signatures[spec].signature

                     )

                 if try_rfc6979 and rfc6979 in key.expected_signatures:

                     return int.to_bytes(

-                        _types.SSH_AGENT.SIGN_RESPONSE.value, 1, "big"

+                        _types.SSH_AGENT.SIGN_RESPONSE, 1, "big"

                     ) + ssh_agent.SSHAgentClient.string(

                         key.expected_signatures[rfc6979].signature

                     )

@@ -444,10 +444,7 @@ class TestStubbedSSHAgentSocketRequests:

             orig_message: bytes | bytearray = bytearray(

                 agent.recv(message_length)

             )

-            assert (

-                _types.SSH_AGENT(orig_message[0])

-                == _types.SSH_AGENT.IDENTITIES_ANSWER

-            )

+            assert orig_message[0] == _types.SSH_AGENT.IDENTITIES_ANSWER

             identity_count = int.from_bytes(orig_message[1:5], "big")

             message = bytes(orig_message[5:])

             for _ in range(identity_count):

@@ -477,9 +474,7 @@ class TestStubbedSSHAgentSocketRequests:

             orig_message: bytes | bytearray = bytearray(

                 agent.recv(message_length)

             )

-            assert (

-                _types.SSH_AGENT(orig_message[0]) == _types.SSH_AGENT.SUCCESS

-            )

+            assert orig_message[0] == _types.SSH_AGENT.SUCCESS

             identity_count = int.from_bytes(orig_message[1:5], "big")

             message = bytes(orig_message[5:])

             for _ in range(identity_count):

@@ -160,9 +160,7 @@ class ListKeysAction(str, enum.Enum):

         if self == self.EMPTY:

             return []

         if self == self.FAIL:

-            raise ssh_agent.SSHAgentFailedError(

-                _types.SSH_AGENT.FAILURE.value, b""

-            )

+            raise ssh_agent.SSHAgentFailedError(_types.SSH_AGENT.FAILURE, b"")

         if self == self.FAIL_RUNTIME:

             raise ssh_agent.TrailingDataError()

         raise AssertionError()

@@ -188,9 +186,7 @@ class SignAction(str, enum.Enum):

         # matching.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

         if self == self.FAIL:

-            raise ssh_agent.SSHAgentFailedError(

-                _types.SSH_AGENT.FAILURE.value, b""

-            )

+            raise ssh_agent.SSHAgentFailedError(_types.SSH_AGENT.FAILURE, b"")

         if self == self.FAIL_RUNTIME:

             raise ssh_agent.TrailingDataError()

         raise AssertionError()

@@ -344,7 +344,9 @@ class Parametrize(types.SimpleNamespace):

                 _types.SSH_AGENT.SUCCESS,

                 ssh_agent.SSHAgentFailedError,

                 re.escape(

-                    f"[Code {_types.SSH_AGENT.IDENTITIES_ANSWER.value}]"

+                    "[Code {:d}]".format(  # noqa: UP032

+                        int(_types.SSH_AGENT.IDENTITIES_ANSWER)

+                    )

                 ),

                 id="REQUEST_IDENTITIES-expect-SUCCESS",

             ),

@@ -1215,22 +1217,22 @@ class TestAgentErrorResponses:

             response_code = (

                 frozenset({_types.SSH_AGENT.SUCCESS})

                 if response_code is None

-                else frozenset({_types.SSH_AGENT(response_code)})

-                if isinstance(response_code, (int, _types.SSH_AGENT))

-                else frozenset(map(_types.SSH_AGENT, response_code))

+                else frozenset({response_code})

+                if isinstance(response_code, int)

+                else response_code

             )

             response_ = request_response_map.get(

                 self.Request(request_code, bytes(payload))

             ) or request_response_map.get(self.Request(request_code, None))

             if response_ is None:  # pragma: no cover [failsafe]

                 raise ssh_agent.SSHAgentFailedError(

-                    _types.SSH_AGENT.FAILURE.value,

+                    _types.SSH_AGENT.FAILURE,

                     "No prepared response for the request "

                     f"({request_code!r}, {payload!r})".encode(),

                 )

             code, response = response_

             if code not in response_code:

-                raise ssh_agent.SSHAgentFailedError(code.value, response)

+                raise ssh_agent.SSHAgentFailedError(code, response)

             return response

         return request