public/pysim
1
0
Fork 1
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-28 16:28:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

pySim.esim.saip: Improve File.from_template feature support

Browse Source 
When populating a File from a FileTemplate, let's make sure we
* correctly treat the maximum file size for BER-TLV files
* respect the default value pattern / repeat pattern
* respect the high_update flag.

Change-Id: I3ba092e0893f53a18264dff5fa37b12ccd9bd47e
This commit is contained in:
Harald Welte
2024-08-05 23:27:25 +02:00
parent 01ddec2fdc
commit 6d495fb24d
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pySim/esim/saip/__init__.py
View File

@@ -107,6 +107,7 @@ class File:
def from_template(self, template: templates.FileTemplate): def from_template(self, template: templates.FileTemplate):
"""Determine defaults for file based on given FileTemplate.""" """Determine defaults for file based on given FileTemplate."""
fdb_dec = {} fdb_dec = {}
pefi = {}
self.rec_len = None self.rec_len = None
if template.fid: if template.fid:
self.fileDescriptor['fileID'] = template.fid.to_bytes(2, 'big') self.fileDescriptor['fileID'] = template.fid.to_bytes(2, 'big')
@@ -126,14 +127,16 @@ class File:
fdb_dec['structure'] = 'linear_fixed' fdb_dec['structure'] = 'linear_fixed'
elif template.file_type == 'CY': elif template.file_type == 'CY':
fdb_dec['structure'] = 'cyclic' fdb_dec['structure'] = 'cyclic'
elif template.file_type in ['TR', 'BT']: elif template.file_type == 'BT':
fdb_dec['file_type'] = 'working_ef' fdb_dec['file_type'] = 'working_ef'
fdb_dec['structure'] = 'ber_tlv'
if template.file_size:
pefi['maximumFileSize'] = template.file_size.to_bytes(2, 'big') # FIXME
elif template.file_type == 'TR':
fdb_dec['file_type'] = 'working_ef'
fdb_dec['structure'] = 'transparent'
if template.file_size: if template.file_size:
self.fileDescriptor['efFileSize'] = template.file_size.to_bytes(2, 'big') # FIXME self.fileDescriptor['efFileSize'] = template.file_size.to_bytes(2, 'big') # FIXME
if template.file_type == 'BT':
fdb_dec['structure'] = 'ber_tlv'
elif template.file_type == 'TR':
fdb_dec['structure'] = 'transparent'
elif template.file_type in ['MF', 'DF', 'ADF']: elif template.file_type in ['MF', 'DF', 'ADF']:
fdb_dec['file_type'] = 'df' fdb_dec['file_type'] = 'df'
fdb_dec['structure'] = 'no_info_given' fdb_dec['structure'] = 'no_info_given'
@@ -142,9 +145,18 @@ class File:
if self.rec_len: if self.rec_len:
fd_dict['record_len'] = self.rec_len fd_dict['record_len'] = self.rec_len
self.fileDescriptor['fileDescriptor'] = build_construct(FileDescriptor._construct, fd_dict) self.fileDescriptor['fileDescriptor'] = build_construct(FileDescriptor._construct, fd_dict)
# FIXME: default_val if template.high_update:
# FIXME: high_update pefi['specialFileInformation'] = b'\x80' # TS 102 222 Table 5
# FIXME: params? try:
if template.default_val_repeat:
pefi['repeatPattern'] = template.expand_default_value_pattern()
elif template.default_val:
pefi['fillPattern'] = template.expand_default_value_pattern()
except ValueError:
# ignore this here as without a file or record length we cannot do this
pass
if len(pefi.keys()):
self.fileDescriptor['proprietaryEFInfo'] = pefi
def from_tuples(self, l:List[Tuple]): def from_tuples(self, l:List[Tuple]):
"""Parse a list of fileDescriptor, fillFileContent, fillFileOffset tuples into this instance.""" """Parse a list of fileDescriptor, fillFileContent, fillFileOffset tuples into this instance."""