laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/35458?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: sysmocom_sja2: Implement EF_CHV files using construct
......................................................................
sysmocom_sja2: Implement EF_CHV files using construct
this has the advantage of getting the encoder for free (so far we only
had the decoder). While at it, also add some tests data for the unit
tests.
Change-Id: Ifb8caf5cd96706d7fb6b452d6552b115c0828797
---
M pySim/sysmocom_sja2.py
1 file changed, 37 insertions(+), 20 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py
index a25bece..5bec446 100644
--- a/pySim/sysmocom_sja2.py
+++ b/pySim/sysmocom_sja2.py
@@ -46,27 +46,31 @@
class EF_PIN(TransparentEF):
- def __init__(self, fid, name):
+ _test_de_encode = [
+ ( 'f1030331323334ffffffff0a0a3132333435363738',
+ { 'state': { 'valid': True, 'change_able': True, 'unblock_able':
True, 'disable_able': True,
+ 'not_initialized': False, 'disabled': True },
+ 'attempts_remaining': 3, 'maximum_attempts': 3, 'pin': '31323334',
+ 'puk': { 'attempts_remaining': 10, 'maximum_attempts': 10, 'puk':
'3132333435363738' }
+ } ),
+ ( 'f003039999999999999999',
+ { 'state': { 'valid': True, 'change_able': True, 'unblock_able':
True, 'disable_able': True,
+ 'not_initialized': False, 'disabled': False },
+ 'attempts_remaining': 3, 'maximum_attempts': 3, 'pin':
'9999999999999999',
+ 'puk': None } ),
+ ]
+ def __init__(self, fid='6f01', name='EF.CHV1'):
super().__init__(fid, name=name, desc='%s PIN file' % name)
-
- def _decode_bin(self, raw_bin_data):
- u = unpack('!BBB8s', raw_bin_data[:11])
- res = {'enabled': (True, False)[u[0] & 0x01],
- 'initialized': (True, False)[u[0] & 0x02],
- 'disable_able': (False, True)[u[0] & 0x10],
- 'unblock_able': (False, True)[u[0] & 0x20],
- 'change_able': (False, True)[u[0] & 0x40],
- 'valid': (False, True)[u[0] & 0x80],
- 'attempts_remaining': u[1],
- 'maximum_attempts': u[2],
- 'pin': u[3].hex(),
- }
- if len(raw_bin_data) == 21:
- u2 = unpack('!BB8s', raw_bin_data[11:10])
- res['attempts_remaining_puk'] = u2[0]
- res['maximum_attempts_puk'] = u2[1]
- res['puk'] = u2[2].hex()
- return res
+ StateByte = FlagsEnum(Byte, disabled=1, not_initialized=2,
disable_able=0x10, unblock_able=0x20,
+ change_able=0x40, valid=0x80)
+ PukStruct = Struct('attempts_remaining'/Int8ub,
+ 'maximum_attempts'/Int8ub,
+ 'puk'/HexAdapter(Rpad(Bytes(8))))
+ self._construct = Struct('state'/StateByte,
+ 'attempts_remaining'/Int8ub,
+ 'maximum_attempts'/Int8ub,
+ 'pin'/HexAdapter(Rpad(Bytes(8))),
+ 'puk'/Optional(PukStruct))
class EF_MILENAGE_CFG(TransparentEF):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35458?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ifb8caf5cd96706d7fb6b452d6552b115c0828797
Gerrit-Change-Number: 35458
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-MessageType: merged
