catarrh/pysim
1
0
Fork 0
forked from public/pysim
Code Pull Requests Activity

pySim.ota.OtaDialectSms: Move SMS header construct up to class level

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

Change-Id: If296f823c18864fddcfb9cb1b82a087bac8875d4
This commit is contained in:
Harald Welte
2024-06-09 16:17:18 +02:00
committed by laforge
parent 1a9cabbbf0
commit 8bd551af32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pySim/ota.py
View File

@@ -322,6 +322,7 @@ class OtaDialectSms(OtaDialect):
'response_status'/ResponseStatus, 'response_status'/ResponseStatus,
'cc_rc'/Bytes(this.rhl-10), 'cc_rc'/Bytes(this.rhl-10),
'secured_data'/GreedyBytes) '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: def encode_cmd(self, otak: OtaKeyset, tar: bytes, spi: dict, apdu: bytes) -> bytes:
# length of signature in octets # length of signature in octets
@@ -343,8 +344,7 @@ class OtaDialectSms(OtaDialect):
chl = 13 + len_sig chl = 13 + len_sig
# CHL + SPI (+ KIC + KID) # CHL + SPI (+ KIC + KID)
c = Struct('chl'/Int8ub, 'spi'/SPI, 'kic'/KIC, 'kid'/KID_CC, 'tar'/Bytes(3)) part_head = self.hdr_construct.build({'chl': chl, 'spi':spi, 'kic':kic, 'kid':kid, 'tar':tar})
part_head = c.build({'chl': chl, 'spi':spi, 'kic':kic, 'kid':kid, 'tar':tar})
#print("part_head: %s" % b2h(part_head)) #print("part_head: %s" % b2h(part_head))
# CNTR + PCNTR (CNTR not used) # CNTR + PCNTR (CNTR not used)