added service specific ciphers

dlms_cosem/connection.py

@@ -47,6 +47,15 @@ class XDlmsApduFactory:
         196: xdlms.GetResponseFactory,
         197: xdlms.SetResponseFactory,
         199: xdlms.ActionResponseFactory,
+
+        # Service Specific Global Ciphering
+        200: xdlms.GlobalGetRequest,
+        201: xdlms.GlobalSetRequest,
+        202: xdlms.GlobalActionNotificationRequest,
+        203: xdlms.GlobalActionRequest,
+        204: xdlms.GlobalGetResponse,
+        205: xdlms.GlobalSetResponse,
+        207: xdlms.GlobalActionResponse,
     }
 
     @classmethod

dlms_cosem/protocol/xdlms/__init__.py

@@ -32,6 +32,15 @@
     GlobalCipherInitiateResponse,
     InitiateResponse,
 )
+from dlms_cosem.protocol.xdlms.service_specific_cipher import (
+    GlobalGetRequest,
+    GlobalSetRequest,
+    GlobalActionNotificationRequest,
+    GlobalActionRequest,
+    GlobalGetResponse,
+    GlobalSetResponse,
+    GlobalActionResponse,
+)
 from dlms_cosem.protocol.xdlms.invoke_id_and_priority import InvokeIdAndPriority
 from dlms_cosem.protocol.xdlms.set import (
     SetRequestFactory,

dlms_cosem/protocol/xdlms/service_specific_cipher.py

@@ -0,0 +1,46 @@
+import attr
+from typing import *
+from dlms_cosem.protocol.xdlms.base import AbstractXDlmsApdu
+from dlms_cosem.protocol.xdlms.initiate_request import GlobalCipherInitiateRequest
+
+
+ServiceSpecificCipher = type(
+    "ServiceSpecificCipher",
+    (AbstractXDlmsApdu,),
+    dict(GlobalCipherInitiateRequest.__dict__),
+)
+
+
+@attr.s(auto_attribs=True)
+class GlobalGetRequest(ServiceSpecificCipher):
+    TAG: ClassVar[int] = 200
+
+
+@attr.s(auto_attribs=True)
+class GlobalSetRequest(ServiceSpecificCipher):
+    TAG: ClassVar[int] = 201
+
+
+@attr.s(auto_attribs=True)
+class GlobalActionNotificationRequest(ServiceSpecificCipher):
+    TAG: ClassVar[int] = 202
+
+
+@attr.s(auto_attribs=True)
+class GlobalActionRequest(ServiceSpecificCipher):
+    TAG: ClassVar[int] = 203
+
+
+@attr.s(auto_attribs=True)
+class GlobalGetResponse(ServiceSpecificCipher):
+    TAG: ClassVar[int] = 204
+
+
+@attr.s(auto_attribs=True)
+class GlobalSetResponse(ServiceSpecificCipher):
+    TAG: ClassVar[int] = 205
+
+
+@attr.s(auto_attribs=True)
+class GlobalActionResponse(ServiceSpecificCipher):
+    TAG: ClassVar[int] = 207

tests/test_xdlms/test_service_specific_cipher.py

@@ -0,0 +1,26 @@
+from dlms_cosem import security
+from dlms_cosem.protocol import xdlms
+
+
+# TODO: move GlobalCipherInitiateRequest here
+def test_glo_get_request():
+    """
+    Example extracted from
+       Table 40 – Example: glo-get-request xDLMS APDU
+    """
+    parsed = xdlms.GlobalGetRequest(
+        security_control=security.SecurityControlField(
+            encrypted=True, authenticated=True, security_suite=0
+        ),
+        invocation_counter=int.from_bytes(bytes.fromhex("01234567"), "big"),
+        ciphered_text=bytes.fromhex(
+            "411312FF935A4756 6827C467BC"  # encrypted
+            "7D825C3BE4A77C3F CC056B6B"  # authentication tag
+        ),
+    )
+
+    raw = bytes.fromhex(
+        "C81E300123456741" "1312FF935A475668" "27C467BC7D825C3B" "E4A77C3FCC056B6B"
+    )
+    assert parsed == xdlms.GlobalGetRequest.from_bytes(raw)
+    assert raw == parsed.to_bytes()