✨ update lib60870-C to 2.3.3, update mbedtls to 3.6.2. improve transport security configuration options

Author: m-unkel

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "depends/lib60870"]
 	path = depends/lib60870
-	url = https://github.com/mz-automation/lib60870.git
+	url = https://github.com/m-unkel/lib60870.git
 	update = rebase
 	ignore = all
 [submodule "depends/pybind11"]

CHANGELOG.md

@@ -7,6 +7,26 @@
 ### Features
 - Serve type hints for all classes and methods as .pyi file
 - Add property `Server.protocol_parameters` and `Connection.protocol_parameters` to be able to read and update protocol parameters like window size and timeouts
+- Serve type hints for all classes and methods as a `.pyi` file.
+- Add the property **Server.protocol_parameters** and **Connection.protocol_parameters** to enable reading and updating protocol parameters, such as window size and timeouts.
+- Introduce the **Client.on_station_initialized** callback to handle end-of-initialization messages.
+- Add the **Station.signal_initialized(cause=...)** method to support sending end-of-initialization messages per station to all connected clients.
+- Send monitoring data formatted as sequences in periodic transmissions and interrogation responses, if possible.
+- Provide Batch Transmission support via the new **Batch** class, in combination with **Server.transmit_batch(...)**, for monitoring direction.
+- Add **TransportSecurity.set_ciphers()** to specify a list of supported cipher suites.
+- Add **TransportSecurity.set_renegotiation_time()** to configure the TLS renegotiation time.
+- Add **TransportSecurity.set_resumption_interval()** to define the session resumption interval.
+- Raise a `ValueError` when modifying a **TransportSecurity** object that is already assigned to a client or server, as changes have no effect.
+
+### Dependencies
+- Minor update of lib60870 to 2.3.3
+- Major update of Mbed TLS to 3.6.2, add support for TLS 1.3
+
+### Deprecations
+- Property **number_of_object** renamed to **number_of_objects** in class **IncomingMessage**
+
+### Breaking Changes
+- Dropped TLS 1.1 support
 
 ## v2.0
 ### Fixes

CMakeLists.txt

@@ -53,38 +53,8 @@ if(NOT ATOMIC_INT64_IS_BUILTIN)
 endif()
 
 # ##############################################################################
-# lib60870-C 2.3.2
+# lib60870-C 2.3.3
 # ##############################################################################
-message(STATUS "Patch lib60870")
-
-# test apply the patch
-execute_process(
-  COMMAND git apply --check --ignore-whitespace ../lib60870.patch
-  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/depends/lib60870
-  RESULT_VARIABLE GIT_APPLY_CHECK_RESULT
-  ERROR_VARIABLE GIT_APPLY_CHECK_ERROR
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# If the patch can be applied cleanly (i.e., it has not been applied yet), apply
-# the patch
-if(GIT_APPLY_CHECK_RESULT EQUAL "0")
-  execute_process(
-    COMMAND git apply --ignore-whitespace ../lib60870.patch
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/depends/lib60870
-    RESULT_VARIABLE GIT_APPLY_RESULT
-    ERROR_VARIABLE GIT_APPLY_ERROR
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  # Check if the patch was applied successfully
-  if(NOT GIT_APPLY_RESULT EQUAL "0")
-    message(FATAL_ERROR "> Failed to apply patch: ${GIT_APPLY_ERROR}")
-  else()
-    message(STATUS "> Patch applied successfully.")
-  endif()
-else()
-  message(STATUS "> Patch already applied or cannot be applied")
-endif()
-
 message(STATUS "Add lib60870")
 set(BUILD_COMMON
     ON
@@ -103,17 +73,17 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/depends/mbedtls/library")
   message(STATUS "> copy mbedtls")
   file(
     MAKE_DIRECTORY
-    "${PROJECT_SOURCE_DIR}/depends/lib60870/lib60870-C/dependencies/mbedtls-2.28"
+    "${PROJECT_SOURCE_DIR}/depends/lib60870/lib60870-C/dependencies/mbedtls-3.6"
   )
   file(
     COPY depends/mbedtls/library depends/mbedtls/include
          depends/mbedtls/CMakeLists.txt
     DESTINATION
-      ${PROJECT_SOURCE_DIR}/depends/lib60870/lib60870-C/dependencies/mbedtls-2.28
+      "${PROJECT_SOURCE_DIR}/depends/lib60870/lib60870-C/dependencies/mbedtls-3.6"
   )
 else()
   if(EXISTS
-     "${PROJECT_SOURCE_DIR}/depends/lib60870/lib60870-C/dependencies/mbedtls-2.28/library"
+     "${PROJECT_SOURCE_DIR}/depends/lib60870/lib60870-C/dependencies/mbedtls-3.6/library"
   )
     message(STATUS " > Use existing copy of mbedtls")
   else()
@@ -131,7 +101,7 @@ list(APPEND c104_tests_PRIVATE_LIBRARIES lib60870)
 include_directories(
   src depends/lib60870/lib60870-C/src/inc/api
   depends/lib60870/lib60870-C/src/hal/inc
-  depends/lib60870/lib60870-C/src/common/inc)
+  depends/lib60870/lib60870-C/src/common/inc depends/mbedtls/include)
 
 set(c104_SOURCES
     src/numbers.h

MANIFEST.in

@@ -2,7 +2,6 @@ graft depends/lib60870/lib60870-C/config
 graft depends/lib60870/lib60870-C/src
 include depends/lib60870/lib60870-C/CMakeLists.txt
 include depends/lib60870/COPYING
-include depends/lib60870.patch
 
 graft depends/mbedtls/library
 graft depends/mbedtls/include