Merge pull request #160 from danielhrisca/master

fix cond_unlock for keys that do not fit in a single unlock message

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.21.9
+current_version = 0.21.10
 commit = True
 tag = False
 

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "traitlets>=5.9.0",
 ]
 name = "pyxcp"
-version = "0.21.9"
+version = "0.21.10"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

pyxcp/__init__.py

@@ -25,4 +25,4 @@
 from .transport import Usb
 
 # if you update this manually, do not forget to update .bumpversion.cfg and pyproject.toml
-__version__ = "0.21.9"
+__version__ = "0.21.10"

pyxcp/master/master.py

@@ -1790,12 +1790,13 @@ def cond_unlock(self, resources=None):
             length = result.length
             if length == 0:
                 continue
-            if length > MAX_PAYLOAD:
-                remaining = length - len(seed)
-                while remaining > 0:
-                    result = self.getSeed(types.XcpGetSeedMode.REMAINING, resource_value)
-                    seed.extend(list(result.seed))
-                    remaining = result.length
+
+            while length - len(seed) > 0:
+                result = self.getSeed(types.XcpGetSeedMode.REMAINING, resource_value)
+                seed.extend(list(result.seed))
+
+            seed = seed[: length]  # maybe there are some padding bytes
+
             result, key = getKey(
                 self.logger,
                 self.seedNKeyDLL,
@@ -1809,9 +1810,8 @@ def cond_unlock(self, resources=None):
                 offset = 0
                 while offset < total_length:
                     data = key[offset : offset + MAX_PAYLOAD]
-                    key_length = len(data)
-                    offset += key_length
-                    self.unlock(key_length, data)
+                    self.unlock(total_length-offset, data)
+                    offset += len(data)
             else:
                 raise SeedNKeyError("SeedAndKey DLL returned: {}".format(SeedNKeyResult(result).name))