[S] Change in pysim[master]: esim.saip: encode an optimised body against the creation content
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/43989?usp=email ) Change subject: esim.saip: encode an optimised body against the creation content ...................................................................... esim.saip: encode an optimised body against the creation content File.file_content_to_tuples(optimize=True) compared the body with the template default, or 'FF', and never with the Fcp's own fill or repeat pattern, which is what the eUICC creates the file with. A byte the body shared with the template default but not with the pattern was left out, and the card kept the pattern there. The fillFileOffset values were also counted from the bytes written so far rather than from the pointer, so every block after the first landed too far into the file. Take the baseline from expand_fill_pattern() when the Fcp declares a pattern, and count each offset from the end of the block written before it. The folder osmocom-pysim-saip-optimised-body-encoding of hampushellsberg-dev/PySIM-upstream-patches on GitHub has the analysis and a repro. Change-Id: Id991f066d6bd2afb6695f06d456613c742311e24 --- M pySim/esim/saip/__init__.py 1 file changed, 16 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 2f305c0..0a50dd3 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -499,19 +499,22 @@ if not optimize: # simplistic approach: encode the full file, ignoring the template/default return [('fillFileContent', self.body)] - # Try to 'compress' the file body, based on the default file contents. - if self.template: + # Try to 'compress' the file body, based on the content the eUICC creates the file with: + # a fill/repeat pattern in the Fcp overwrites the template default (SAIP section 8.3.3) + if self.fill_pattern: + default = self.expand_fill_pattern() + elif self.template: default = self.template.expand_default_value_pattern(length=len(self.body)) - if not default: - sm = SequenceMatcher(a=b'\xff'*len(self.body), b=self.body) - else: - if default == self.body: - # 100% match: return an empty tuple list to make eUICC use the default - return [] - sm = SequenceMatcher(a=default, b=self.body) else: - # no template at all: we can only remove padding + default = None + if not default: + # no pattern and no default: we can only remove padding sm = SequenceMatcher(a=b'\xff'*len(self.body), b=self.body) + else: + if default == self.body: + # 100% match: return an empty tuple list to make eUICC use the default + return [] + sm = SequenceMatcher(a=default, b=self.body) matching_blocks = sm.get_matching_blocks() # we can only make use of matches that have the same offset in 'a' and 'b' matching_blocks = [x for x in matching_blocks if x.size > 0 and x.a == x.b] @@ -519,9 +522,11 @@ ret = [] cur = 0 for block in non_matching_blocks: + # fillFileOffset moves the pointer relative to its current position, and + # fillFileContent leaves it after the last byte written (SAIP section 8.3.5) ret.append(('fillFileOffset', block.a - cur)) ret.append(('fillFileContent', self.body[block.a:block.a+block.size])) - cur += block.size + cur = block.a + block.size return ret def __str__(self) -> str: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43989?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id991f066d6bd2afb6695f06d456613c742311e24 Gerrit-Change-Number: 43989 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge@osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-CC: hampushellsberg <hampushellsberg@gmail.com>
participants (1)
-
laforge