laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/37653?usp=email )
Change subject: pySim.ts_102_221: Fix FileDescriptor encoding for BER-TLV case
......................................................................
pySim.ts_102_221: Fix FileDescriptor encoding for BER-TLV case
This fixes a long-standing bug in the FileDescriptor IE class which so
far only supported decoding, but not encoding of BER-TLV file
descriptors.
Change-Id: I598b0e1709ee004bcf01a53beb91f68470e1f3da
---
M pySim/ts_102_221.py
1 file changed, 18 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/37653/1
diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py
index 1b40b09..5661cf4 100644
--- a/pySim/ts_102_221.py
+++ b/pySim/ts_102_221.py
@@ -94,24 +94,20 @@
# ETSI TS 102 221 11.1.1.4.3
class FileDescriptor(BER_TLV_IE, tag=0x82):
- _test_decode = [
- # FIXME: this doesn't work as _encode test for some strange reason.
- ( '82027921', { "file_descriptor_byte": { "shareable": True,
"structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ),
- ]
_test_de_encode = [
+ ( '82027921', { "file_descriptor_byte": { "shareable": True,
"structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ),
( '82027821', { "file_descriptor_byte": { "shareable": True,
"file_type": "df", "structure": "no_info_given" }, "record_len": None,
"num_of_rec": None }),
( '82024121', { "file_descriptor_byte": { "shareable": True,
"file_type": "working_ef", "structure": "transparent" }, "record_len": None,
"num_of_rec": None } ),
( '82054221006e05', { "file_descriptor_byte": { "shareable": True,
"file_type": "working_ef", "structure": "linear_fixed" }, "record_len": 110,
"num_of_rec": 5 } ),
]
class BerTlvAdapter(Adapter):
- def _parse(self, obj, context, path):
- data = obj.read()
- if data == b'\x01\x01\x01\x00\x00\x01':
+ def _decode(self, obj, context, path):
+ if obj == 0x39:
return 'ber_tlv'
raise ValidationError
- def _build(self, obj, context, path):
+ def _encode(self, obj, context, path):
if obj == 'ber_tlv':
- return b'\x01\x01\x01\x00\x00\x01'
+ return 0x39
raise ValidationError
FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag,
'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6)))),
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37653?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: I598b0e1709ee004bcf01a53beb91f68470e1f3da
Gerrit-Change-Number: 37653
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <[email protected]>
Gerrit-MessageType: newchange
