laforge submitted this change.

View Change


Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified
pySim.ota.OtaDialectSms: Move SMS header construct up to class level

this way we can use it in other [future] methods.

Change-Id: If296f823c18864fddcfb9cb1b82a087bac8875d4
---
M pySim/ota.py
1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pySim/ota.py b/pySim/ota.py
index 54e8f75..d77a64e 100644
--- a/pySim/ota.py
+++ b/pySim/ota.py
@@ -322,6 +322,7 @@
'response_status'/ResponseStatus,
'cc_rc'/Bytes(this.rhl-10),
'secured_data'/GreedyBytes)
+ hdr_construct = Struct('chl'/Int8ub, 'spi'/SPI, 'kic'/KIC, 'kid'/KID_CC, 'tar'/Bytes(3))

def encode_cmd(self, otak: OtaKeyset, tar: bytes, spi: dict, apdu: bytes) -> bytes:
# length of signature in octets
@@ -343,8 +344,7 @@
chl = 13 + len_sig

# CHL + SPI (+ KIC + KID)
- c = Struct('chl'/Int8ub, 'spi'/SPI, 'kic'/KIC, 'kid'/KID_CC, 'tar'/Bytes(3))
- part_head = c.build({'chl': chl, 'spi':spi, 'kic':kic, 'kid':kid, 'tar':tar})
+ part_head = self.hdr_construct.build({'chl': chl, 'spi':spi, 'kic':kic, 'kid':kid, 'tar':tar})
#print("part_head: %s" % b2h(part_head))

# CNTR + PCNTR (CNTR not used)

To view, visit change 37140. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: If296f823c18864fddcfb9cb1b82a087bac8875d4
Gerrit-Change-Number: 37140
Gerrit-PatchSet: 7
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-MessageType: merged