February 2024 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pylint: esim/saip/personalization.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35834?usp=email ) Change subject: pylint: esim/saip/personalization.py ...................................................................... pylint: esim/saip/personalization.py pySim/esim/saip/personalization.py:104:0: W0311: Bad indentation. Found 17 spaces, expected 16 (bad-indentation) pySim/esim/saip/personalization.py:105:0: W0311: Bad indentation. Found 17 spaces, expected 16 (bad-indentation) pySim/esim/saip/personalization.py:151:0: C0305: Trailing newlines (trailing-newlines) pySim/esim/saip/personalization.py:36:4: C0204: Metaclass class method __new__ should have 'mcs' as first argument (bad-mcs-classmethod-argument) pySim/esim/saip/personalization.py:56:4: W0237: Parameter 'pe_seq' has been renamed to 'pes' in overriding 'Iccid.apply' method (arguments-renamed) pySim/esim/saip/personalization.py:19:0: W0611: Unused Optional imported from typing (unused-import) Change-Id: I70b3e266bbafabbfcec3d48027d50b45c2c17809 --- M pySim/esim/saip/personalization.py 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/34/35834/1 diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index cb3edc1..fd83387 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import abc -from typing import List, Tuple, Optional +from typing import List, Tuple from pySim.esim.saip import ProfileElement, ProfileElementSequence @@ -47,7 +47,7 @@ self.value = value @abc.abstractmethod - def apply(self, pe_seq: ProfileElementSequence): + def apply(self, pes: ProfileElementSequence): pass class Iccid(ConfigurableParameter): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35834?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: I70b3e266bbafabbfcec3d48027d50b45c2c17809 Gerrit-Change-Number: 35834 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pylint: esim/saip/templates.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35835?usp=email ) Change subject: pylint: esim/saip/templates.py ...................................................................... pylint: esim/saip/templates.py pySim/esim/saip/templates.py:106:0: R1707: Disallow trailing comma tuple (trailing-comma-tuple) pySim/esim/saip/templates.py:56:37: C0121: Comparison 'self.fid != None' should be 'self.fid is not None' (singleton-comparison) pySim/esim/saip/templates.py:57:28: C0121: Comparison 'self.arr != None' should be 'self.arr is not None' (singleton-comparison) pySim/esim/saip/templates.py:58:37: C0121: Comparison 'self.sfi != None' should be 'self.sfi is not None' (singleton-comparison) pySim/esim/saip/templates.py:96:11: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/esim/saip/templates.py:591:0: W1404: Implicit string concatenation found in list (implicit-str-concat) Change-Id: I181578ba630c8bdb558297e990411b59593652a0 --- M pySim/esim/saip/templates.py 1 file changed, 22 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/35835/1 diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index 44c2ac5..cd76247 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -53,9 +53,9 @@ return "FileTemplate(%s)" % (self.name) def __repr__(self) -> str: - s_fid = "%04x" % self.fid if self.fid != None else 'None' - s_arr = self.arr if self.arr != None else 'None' - s_sfi = "%02x" % self.sfi if self.sfi != None else 'None' + s_fid = "%04x" % self.fid if self.fid is not None else 'None' + s_arr = self.arr if self.arr is not None else 'None' + s_sfi = "%02x" % self.sfi if self.sfi is not None else 'None' return "FileTemplate(%s/%s, %s, %s, arr=%s, sfi=%s)" % (self.name, self.pe_name, s_fid, self.file_type, s_arr, s_sfi) @@ -93,7 +93,7 @@ def get_by_oid(cls, oid: Union[List[int], str]) -> Optional[ProfileTemplate]: """Look-up the ProfileTemplate based on its OID. The OID can be given either in dotted-string format, or as a list of integers.""" - if type(oid) is not str: + if not isinstance(oid, str): oid = OID.OID.str_from_intlist(oid) return cls.by_oid.get(oid, None) @@ -103,7 +103,7 @@ # Section 9.2 class FilesAtMF(ProfileTemplate): created_by_default = True - oid = OID.MF, + oid = OID.MF files = [ FileTemplate(0x3f00, 'MF', 'MF', None, None, 14, None, None, None, params=['pinStatusTemplateDO']), FileTemplate(0x2f05, 'EF.PL', 'TR', None, 2, 1, 0x05, 'FF...FF', None), @@ -588,7 +588,7 @@ created_by_default = True oid = OID.ADF_ISIM_by_default files = [ - FileTemplate( None, 'ADF.ISIM', 'ADF', None, None, 14, None, None, False, ['aid','temporary_fid''pinStatusTemplateDO']), + FileTemplate( None, 'ADF.ISIM', 'ADF', None, None, 14, None, None, False, ['aid','temporary_fid','pinStatusTemplateDO']), FileTemplate(0x6f02, 'EF.IMPI', 'TR', None, None, 2, 0x02, None, True, ['size']), FileTemplate(0x6f04, 'EF.IMPU', 'LF', 1, None, 2, 0x04, None, True, ['size']), FileTemplate(0x6f03, 'EF.Domain', 'TR', None, None, 2, 0x05, None, True, ['size']), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35835?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: I181578ba630c8bdb558297e990411b59593652a0 Gerrit-Change-Number: 35835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pylint: esim/saip/oid.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35836?usp=email ) Change subject: pylint: esim/saip/oid.py ...................................................................... pylint: esim/saip/oid.py pySim/esim/saip/oid.py:30:11: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/esim/saip/oid.py:46:11: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) Change-Id: I65c9cd1bb2b6a1747a7fbb25052adc75605bc870 --- M pySim/esim/saip/oid.py 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/35836/1 diff --git a/pySim/esim/saip/oid.py b/pySim/esim/saip/oid.py index e1892be..238e49f 100644 --- a/pySim/esim/saip/oid.py +++ b/pySim/esim/saip/oid.py @@ -27,7 +27,7 @@ return '.'.join([str(x) for x in intlist]) def __init__(self, initializer: Union[List[int], str]): - if type(initializer) == str: + if isinstance(initializer, str): self.intlist = self.intlist_from_str(initializer) else: self.intlist = initializer @@ -43,7 +43,7 @@ """OID helper for TCA eUICC prefix""" __prefix = [2,23,143,1] def __init__(self, initializer): - if type(initializer) == str: + if isinstance(initializer, str): initializer = self.intlist_from_str(initializer) super().__init__(self.__prefix + initializer) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35836?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: I65c9cd1bb2b6a1747a7fbb25052adc75605bc870 Gerrit-Change-Number: 35836 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pylint: cdma_ruim.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35838?usp=email ) Change subject: pylint: cdma_ruim.py ...................................................................... pylint: cdma_ruim.py pySim/cdma_ruim.py:30:0: W0401: Wildcard import construct (wildcard-import) pySim/cdma_ruim.py:188:4: W0237: Parameter 'data_hex' has been renamed to 'resp_hex' in overriding 'CardProfileRUIM.decode_select_response' method (arguments-renamed) pySim/cdma_ruim.py:30:0: C0411: third party import "from construct import *" should be placed before "from pySim.utils import *" (wrong-import-order) Change-Id: I4c384f37a6a317c6eddef8742572fcfa76a5fc20 --- M pySim/cdma_ruim.py 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/38/35838/1 diff --git a/pySim/cdma_ruim.py b/pySim/cdma_ruim.py index ad50e60..d16aefc 100644 --- a/pySim/cdma_ruim.py +++ b/pySim/cdma_ruim.py @@ -19,6 +19,8 @@ import enum +from construct import Bytewise, BitStruct, BitsInteger, Struct, FlagsEnum + from pySim.utils import * from pySim.filesystem import * from pySim.profile import match_ruim @@ -27,7 +29,6 @@ from pySim.ts_51_011 import DF_TELECOM, DF_GSM from pySim.ts_51_011 import EF_ServiceTable from pySim.construct import * -from construct import * # Mapping between CDMA Service Number and its description @@ -185,9 +186,9 @@ sel_ctrl="0000", files_in_mf=[DF_TELECOM(), DF_GSM(), DF_CDMA()]) @staticmethod - def decode_select_response(resp_hex: str) -> object: + def decode_select_response(data_hex: str) -> object: # TODO: Response parameters/data in case of DF_CDMA (section 2.6) - return CardProfileSIM.decode_select_response(resp_hex) + return CardProfileSIM.decode_select_response(data_hex) @staticmethod def match_with_card(scc: SimCardCommands) -> bool: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35838?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: I4c384f37a6a317c6eddef8742572fcfa76a5fc20 Gerrit-Change-Number: 35838 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pylint: global_platform/scp.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35837?usp=email ) Change subject: pylint: global_platform/scp.py ...................................................................... pylint: global_platform/scp.py pySim/global_platform/scp.py:27:0: W0404: Reimport 'Optional' (imported line 20) (reimported) pySim/global_platform/scp.py:157:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/global_platform/scp.py:165:8: W0107: Unnecessary pass statement (unnecessary-pass) pySim/global_platform/scp.py:182:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/global_platform/scp.py:189:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/global_platform/scp.py:266:4: W0221: Variadics removed in overriding 'SCP02._wrap_cmd_apdu' method (arguments-differ) pySim/global_platform/scp.py:298:4: W0237: Parameter 'rsp_apdu' has been renamed to 'apdu' in overriding 'SCP02.unwrap_rsp_apdu' method (arguments-renamed) pySim/global_platform/scp.py:314:7: C0121: Comparison 'l == None' should be 'l is None' (singleton-comparison) pySim/global_platform/scp.py:436:11: C0121: Comparison 'host_challenge == None' should be 'host_challenge is None' (singleton-comparison) pySim/global_platform/scp.py:506:4: W0237: Parameter 'rsp_apdu' has been renamed to 'apdu' in overriding 'SCP03.unwrap_rsp_apdu' method (arguments-renamed) pySim/global_platform/scp.py:27:0: C0411: standard import "from typing import Optional" should be placed before "from Cryptodome.Cipher import DES3, DES" (wrong-import-order) Change-Id: Idd2b779a6628c88d9a48c94b8581525209824426 --- M pySim/global_platform/scp.py 1 file changed, 36 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/37/35837/1 diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 4e64e41..0804492 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -24,15 +24,14 @@ from construct import Optional as COptional from pySim.utils import b2h, bertlv_parse_len, bertlv_encode_len from pySim.secure_channel import SecureChannel -from typing import Optional logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) def scp02_key_derivation(constant: bytes, counter: int, base_key: bytes) -> bytes: - assert(len(constant) == 2) + assert len(constant) == 2 assert(counter >= 0 and counter <= 65535) - assert(len(base_key) == 16) + assert len(base_key) == 16 derivation_data = constant + counter.to_bytes(2, 'big') + b'\x00' * 12 cipher = DES3.new(base_key, DES.MODE_CBC, b'\x00' * 8) @@ -156,8 +155,7 @@ # only protect those APDUs that actually are global platform commands if apdu[0] & 0x80: return self._wrap_cmd_apdu(apdu, *args, **kwargs) - else: - return apdu + return apdu @abc.abstractmethod def _wrap_cmd_apdu(self, apdu: bytes, *args, **kwargs) -> bytes: @@ -181,8 +179,7 @@ num_pad = len(key) % self.sk.blocksize if num_pad: return bertlv_encode_len(len(key)) + self.dek_encrypt(key + b'\x00'*num_pad) - else: - return self.dek_encrypt(key) + return self.dek_encrypt(key) def decrypt_key(self, encrypted_key:bytes) -> bytes: """Decrypt a key with the DEK.""" @@ -263,7 +260,7 @@ mac = self.sk.calc_mac_1des(header + self.host_cryptogram, True) return bytes([self._cla(True), INS_EXT_AUTH, self.security_level, 0, 16]) + self.host_cryptogram + mac - def _wrap_cmd_apdu(self, apdu: bytes) -> bytes: + def _wrap_cmd_apdu(self, apdu: bytes, *args, **kwargs) -> bytes: """Wrap Command APDU for SCP02: calculate MAC and encrypt.""" lc = len(apdu) - 5 assert len(apdu) >= 5, "Wrong APDU length: %d" % len(apdu) @@ -295,9 +292,9 @@ apdu = bytes([self._cla(True, b8)]) + apdu[1:4] + bytes([lc]) + data + mac return apdu - def unwrap_rsp_apdu(self, sw: bytes, apdu: bytes) -> bytes: + def unwrap_rsp_apdu(self, sw: bytes, rsp_apdu: bytes) -> bytes: # TODO: Implement R-MAC / R-ENC - return apdu + return rsp_apdu @@ -311,7 +308,7 @@ def prf(key: bytes, data:bytes): return CMAC.new(key, data, AES).digest() - if l == None: + if l is None: l = len(base_key) * 8 logger.debug("scp03_kdf(constant=%s, context=%s, base_key=%s, l=%u)", b2h(constant), b2h(context), b2h(base_key), l) @@ -433,7 +430,7 @@ def gen_init_update_apdu(self, host_challenge: Optional[bytes] = None) -> bytes: """Generate INITIALIZE UPDATE APDU.""" - if host_challenge == None: + if host_challenge is None: host_challenge = b'\x00' * self.s_mode if len(host_challenge) != self.s_mode: raise ValueError('Host Challenge must be %u bytes long' % self.s_mode) @@ -503,20 +500,20 @@ return mapdu - def unwrap_rsp_apdu(self, sw: bytes, apdu: bytes) -> bytes: + def unwrap_rsp_apdu(self, sw: bytes, rsp_apdu: bytes) -> bytes: # No R-MAC shall be generated and no protection shall be applied to a response that includes an error # status word: in this case only the status word shall be returned in the response. All status words # except '9000' and warning status words (i.e. '62xx' and '63xx') shall be interpreted as error status # words. - logger.debug("unwrap_rsp_apdu(sw=%s, apdu=%s)", sw, apdu) + logger.debug("unwrap_rsp_apdu(sw=%s, rsp_apdu=%s)", sw, rsp_apdu) if not self.do_rmac: assert not self.do_renc - return apdu + return rsp_apdu if sw != b'\x90\x00' and sw[0] not in [0x62, 0x63]: - return apdu - response_data = apdu[:-self.s_mode] - rmac = apdu[-self.s_mode:] + return rsp_apdu + response_data = rsp_apdu[:-self.s_mode] + rmac = rsp_apdu[-self.s_mode:] rmac_exp = self.sk.calc_rmac(response_data + sw)[:self.s_mode] if rmac != rmac_exp: raise ValueError("R-MAC value not matching: received: %s, computed: %s" % (rmac, rmac_exp)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35837?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: Idd2b779a6628c88d9a48c94b8581525209824426 Gerrit-Change-Number: 35837 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pylint: sysmocom_sja2.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35839?usp=email ) Change subject: pylint: sysmocom_sja2.py ...................................................................... pylint: sysmocom_sja2.py pySim/sysmocom_sja2.py:20:0: W0401: Wildcard import pytlv.TLV (wildcard-import) pySim/sysmocom_sja2.py:27:0: W0401: Wildcard import construct (wildcard-import) pySim/sysmocom_sja2.py:21:0: C0411: standard import "from struct import pack, unpack" should be placed before "from pytlv.TLV import *" (wrong-import-order) pySim/sysmocom_sja2.py:27:0: C0411: third party import "from construct import *" should be placed before "from pySim.utils import *" (wrong-import-order) pySim/sysmocom_sja2.py:21:0: W0611: Unused pack imported from struct (unused-import) pySim/sysmocom_sja2.py:25:0: W0611: Unused CardProfileUICC imported from pySim.ts_102_221 (unused-import) Change-Id: I0e5b5c6f3179f9710464af4cba91d682412b8a09 --- M pySim/sysmocom_sja2.py 1 file changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/35839/1 diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 5bec446..2dcf7f7 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -17,14 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from pytlv.TLV import * -from struct import pack, unpack +from struct import unpack +from construct import FlagsEnum, Byte, Struct, Int8ub, Bytes, Mapping, Enum, Padding, BitsInteger +from construct import Bit, this, Int32ub, Int16ub, Nibble, BytesInteger, GreedyRange + from pySim.utils import * from pySim.filesystem import * from pySim.runtime import RuntimeState -from pySim.ts_102_221 import CardProfileUICC from pySim.construct import * -from construct import * import pySim key_type2str = { -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35839?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: I0e5b5c6f3179f9710464af4cba91d682412b8a09 Gerrit-Change-Number: 35839 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pylint: ts_31_102.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35840?usp=email ) Change subject: pylint: ts_31_102.py ...................................................................... pylint: ts_31_102.py Change-Id: I5b72ad476d338aa4048bb15a74796ef69191f028 --- M pySim/ts_31_102.py 1 file changed, 26 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/35840/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 0614a0c..0ddf218 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -26,7 +26,12 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -# Mapping between USIM Service Number and its description +import enum + +from construct import Optional as COptional +from construct import Int32ub, Nibble, GreedyRange, Struct, FlagsEnum, Switch, this, Int16ub, Padding +from construct import Bytewise, Int24ub, PaddedString + import pySim.ts_102_221 from pySim.ts_51_011 import EF_ACMmax, EF_AAeM, EF_eMLPP, EF_CMI, EF_PNN from pySim.ts_51_011 import EF_MMSN, EF_MMSICP, EF_MMSUP, EF_MMSUCP, EF_VGCS, EF_VGCSS, EF_NIA @@ -41,11 +46,8 @@ from pySim.construct import * from pySim.utils import is_hexstr from pySim.cat import SMS_TPDU, DeviceIdentities, SMSPPDownload -from construct import Optional as COptional -from construct import * -from typing import Tuple -from struct import unpack, pack -import enum + +# Mapping between USIM Service Number and its description EF_UST_map = { 1: 'Local Phone Book', 2: 'Fixed Dialling Numbers (FDN)', @@ -400,15 +402,15 @@ desc='Language Indication'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) - def _decode_record_bin(self, in_bin, **kwargs): + def _decode_record_bin(self, in_bin, **_kwargs): if in_bin == b'\xff\xff': return None else: # officially this is 7-bit GSM alphabet with one padding bit in each byte return in_bin.decode('ascii') - def _encode_record_bin(self, in_json, **kwargs): - if in_json == None: + def _encode_record_bin(self, in_json, **_kwargs): + if in_json is None: return b'\xff\xff' else: # officially this is 7-bit GSM alphabet with one padding bit in each byte @@ -438,9 +440,6 @@ @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - def do_ust_service_activate(self, arg): """Activate a service within EF.UST""" selected_file = self._cmd.lchan.selected_file @@ -451,7 +450,7 @@ selected_file = self._cmd.lchan.selected_file selected_file.ust_update(self._cmd, [], [int(arg)]) - def do_ust_service_check(self, arg): + def do_ust_service_check(self, _arg): """Check consistency between services of this file and files present/activated. Many services determine if one or multiple files shall be present/activated or if they shall be @@ -503,7 +502,7 @@ desc='Emergency Call Codes'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(4, 20)) - def _decode_record_bin(self, in_bin, **kwargs): + def _decode_record_bin(self, in_bin, **_kwargs): # mandatory parts code = in_bin[:3] if code == b'\xff\xff\xff': @@ -517,7 +516,7 @@ ret['alpha_id'] = parse_construct(EF_ECC.alpha_construct, alpha_id) return ret - def _encode_record_bin(self, in_json, **kwargs): + def _encode_record_bin(self, in_json, **_kwargs): if in_json is None: return b'\xff\xff\xff\xff' code = EF_ECC.cc_construct.build(in_json['call_code']) @@ -638,9 +637,6 @@ @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - def do_est_service_enable(self, arg): """Enable a service within EF.EST""" selected_file = self._cmd.lchan.selected_file @@ -683,7 +679,7 @@ def __init__(self, fid='6f65', sfid=None, name='EF.RPLMNAcTD', size=(2, 4), rec_len=2, desc='RPLMN Last used Access Technology', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) - def _decode_record_hex(self, in_hex, **kwargs): + def _decode_record_hex(self, in_hex, **_kwargs): return dec_act(in_hex) # TODO: Encode @@ -1139,9 +1135,6 @@ @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - def do_prose_service_activate(self, arg): """Activate a service within EF.5G_PROSE_ST""" selected_file = self._cmd.lchan.selected_file @@ -1585,9 +1578,6 @@ @with_default_category('Application-Specific Commands') class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - authenticate_parser = argparse.ArgumentParser() authenticate_parser.add_argument('rand', type=is_hexstr, help='Random challenge') authenticate_parser.add_argument('autn', type=is_hexstr, help='Authentication Nonce') @@ -1596,7 +1586,7 @@ @cmd2.with_argparser(authenticate_parser) def do_authenticate(self, opts): """Perform Authentication and Key Agreement (AKA).""" - (data, sw) = self._cmd.lchan.scc.authenticate(opts.rand, opts.autn) + (data, _sw) = self._cmd.lchan.scc.authenticate(opts.rand, opts.autn) self._cmd.poutput_json(data) term_prof_parser = argparse.ArgumentParser() @@ -1654,7 +1644,7 @@ context = 0x01 # SUCI if opts.nswo_context: context = 0x02 # SUCI 5G NSWO - (data, sw) = self._cmd.lchan.scc.get_identity(context) + (data, _sw) = self._cmd.lchan.scc.get_identity(context) do = SUCI_TlvDataObject() do.from_tlv(h2b(data)) do_d = do.to_dict() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35840?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: I5b72ad476d338aa4048bb15a74796ef69191f028 Gerrit-Change-Number: 35840 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pylint: apdu/ts_102_221.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35841?usp=email ) Change subject: pylint: apdu/ts_102_221.py ...................................................................... pylint: apdu/ts_102_221.py pySim/apdu/ts_102_221.py:60:16: R1724: Unnecessary "else" after "continue", remove the "else" and de-indent the code inside it (no-else-continue) pySim/apdu/ts_102_221.py:107:16: W0107: Unnecessary pass statement (unnecessary-pass) pySim/apdu/ts_102_221.py:294:8: R1703: The if statement can be replaced with 'return bool(test)' (simplifiable-if-statement) pySim/apdu/ts_102_221.py:294:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/apdu/ts_102_221.py:299:31: W0613: Unused argument 'lchan' (unused-argument) ... pySim/apdu/ts_102_221.py:389:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/apdu/ts_102_221.py:421:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/apdu/ts_102_221.py:425:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/apdu/ts_102_221.py:438:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/apdu/ts_102_221.py:26:0: C0411: standard import "from typing import Optional, Dict, Tuple" should be placed before "from construct import GreedyRange, Struct" (wrong-import-order) Change-Id: Id5caac8da4c965dbaf88d624cdc9dcc8fc168b8c --- M pySim/apdu/ts_102_221.py 1 file changed, 36 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/35841/1 diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 48401c0..6e14b8a 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -17,13 +17,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ +from typing import Optional, Dict import logging + from construct import GreedyRange, Struct + from pySim.construct import * from pySim.filesystem import * from pySim.runtime import RuntimeLchan from pySim.apdu import ApduCommand, ApduCommandSet -from typing import Optional, Dict, Tuple logger = logging.getLogger(__name__) @@ -104,7 +106,6 @@ #print("\tSELECT AID %s" % adf) else: logger.warning('SELECT UNKNOWN AID %s', aid) - pass else: raise ValueError('Select Mode %s not implemented' % mode) # decode the SELECT response @@ -291,12 +292,9 @@ @staticmethod def _pin_is_success(sw): - if sw[0] == 0x63: - return True - else: - return False + return bool(sw[0] == 0x63) - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -308,7 +306,7 @@ _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -320,7 +318,7 @@ _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -331,7 +329,7 @@ class EnablePin(ApduCommand, n='ENABLE PIN', ins=0x28, cla=['0X', '4X', '6X']): _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -343,7 +341,7 @@ _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -396,13 +394,12 @@ manage_channel.add_lchan(created_channel_nr) self.col_id = '%02u' % created_channel_nr return {'mode': mode, 'created_channel': created_channel_nr } - elif mode == 'close_channel': + if mode == 'close_channel': closed_channel_nr = self.cmd_dict['p2']['logical_channel_number'] rs.del_lchan(closed_channel_nr) self.col_id = '%02u' % closed_channel_nr return {'mode': mode, 'closed_channel': closed_channel_nr } - else: - raise ValueError('Unsupported MANAGE CHANNEL P1=%02X' % self.p1) + raise ValueError('Unsupported MANAGE CHANNEL P1=%02X' % self.p1) # TS 102 221 Section 11.1.18 class GetChallenge(ApduCommand, n='GET CHALLENGE', ins=0x84, cla=['0X', '4X', '6X']): @@ -420,13 +417,13 @@ p2 = hdr[3] if p1 & 0x7 == 0: # retrieve UICC Endpoints return 2 - elif p1 & 0xf in [1,2,3]: # establish sa, start secure channel SA + if p1 & 0xf in [1,2,3]: # establish sa, start secure channel SA p2_cmd = p2 >> 5 if p2_cmd in [0,2,4]: # command data return 3 - elif p2_cmd in [1,3,5]: # response data + if p2_cmd in [1,3,5]: # response data return 2 - elif p1 & 0xf == 4: # terminate secure channel SA + if p1 & 0xf == 4: # terminate secure channel SA return 3 raise ValueError('%s: Unable to detect APDU case for %s' % (cls.__name__, b2h(hdr))) @@ -437,8 +434,7 @@ p1 = hdr[2] if p1 & 0x04: return 3 - else: - return 2 + return 2 # TS 102 221 Section 11.1.22 class SuspendUicc(ApduCommand, n='SUSPEND UICC', ins=0x76, cla=['80']): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35841?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: Id5caac8da4c965dbaf88d624cdc9dcc8fc168b8c Gerrit-Change-Number: 35841 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pylint: ara_m.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35843?usp=email ) Change subject: pylint: ara_m.py ...................................................................... pylint: ara_m.py pySim/ara_m.py:29:0: W0622: Redefining built-in 'BlockingIOError' (redefined-builtin) pySim/ara_m.py:29:0: W0401: Wildcard import construct (wildcard-import) pySim/ara_m.py:68:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/ara_m.py:89:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/ara_m.py:282:12: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/ara_m.py:280:15: W0612: Unused variable 'sw' (unused-variable) pySim/ara_m.py:312:34: W0613: Unused argument 'opts' (unused-argument) pySim/ara_m.py:318:37: W0613: Unused argument 'opts' (unused-argument) pySim/ara_m.py:356:15: C0121: Comparison 'opts.aid != None' should be 'opts.aid is not None' (singleton-comparison) pySim/ara_m.py:385:37: W0613: Unused argument 'opts' (unused-argument) pySim/ara_m.py:309:8: W0238: Unused private member `AddlShellCommands.__init(self)` (unused-private-member) pySim/ara_m.py:309:8: W0238: Unused private member `ADF_ARAM.AddlShellCommands.__init(self)` (unused-private-member) Change-Id: I5a739187a8966cdb0ae5c6cbc7bc5d4115433aeb --- M pySim/ara_m.py 1 file changed, 33 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/35843/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index d137dcf..4fa965e 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -26,7 +26,7 @@ # -from construct import * +from construct import GreedyBytes, GreedyString, Struct, Enum, Int8ub from construct import Optional as COptional from pySim.construct import * from pySim.filesystem import * @@ -68,11 +68,10 @@ if do[0] == 0x00: self.decoded = {'generic_access_rule': 'never'} return self.decoded - elif do[0] == 0x01: + if do[0] == 0x01: self.decoded = {'generic_access_rule': 'always'} return self.decoded - else: - return ValueError('Invalid 1-byte generic APDU access rule') + return ValueError('Invalid 1-byte generic APDU access rule') else: if len(do) % 8: return ValueError('Invalid non-modulo-8 length of APDU filter: %d' % len(do)) @@ -88,10 +87,9 @@ if 'generic_access_rule' in self.decoded: if self.decoded['generic_access_rule'] == 'never': return b'\x00' - elif self.decoded['generic_access_rule'] == 'always': + if self.decoded['generic_access_rule'] == 'always': return b'\x01' - else: - return ValueError('Invalid 1-byte generic APDU access rule') + return ValueError('Invalid 1-byte generic APDU access rule') else: if not 'apdu_filter' in self.decoded: return ValueError('Invalid APDU AR DO') @@ -277,14 +275,13 @@ cmd_do_enc = b'' cmd_do_len = 0 c_apdu = hdr + ('%02x' % cmd_do_len) + b2h(cmd_do_enc) - (data, sw) = tp.send_apdu_checksw(c_apdu, exp_sw) + (data, _sw) = tp.send_apdu_checksw(c_apdu, exp_sw) if data: if resp_cls: resp_do = resp_cls() resp_do.from_tlv(h2b(data)) return resp_do - else: - return data + return data else: return None @@ -306,16 +303,13 @@ @with_default_category('Application-Specific Commands') class AddlShellCommands(CommandSet): - def __init(self): - super().__init__() - - def do_aram_get_all(self, opts): + def do_aram_get_all(self, _opts): """GET DATA [All] on the ARA-M Applet""" res_do = ADF_ARAM.get_all(self._cmd.lchan.scc._tp) if res_do: self._cmd.poutput_json(res_do.to_dict()) - def do_aram_get_config(self, opts): + def do_aram_get_config(self, _opts): """Perform GET DATA [Config] on the ARA-M Applet: Tell it our version and retrieve its version.""" res_do = ADF_ARAM.get_config(self._cmd.lchan.scc._tp) if res_do: @@ -353,7 +347,7 @@ """Perform STORE DATA [Command-Store-REF-AR-DO] to store a (new) access rule.""" # REF ref_do_content = [] - if opts.aid != None: + if opts.aid is not None: ref_do_content += [{'aid_ref_do': opts.aid}] elif opts.aid_empty: ref_do_content += [{'aid_ref_empty_do': None}] @@ -382,7 +376,7 @@ if res_do: self._cmd.poutput_json(res_do.to_dict()) - def do_aram_delete_all(self, opts): + def do_aram_delete_all(self, _opts): """Perform STORE DATA [Command-Delete[all]] to delete all access rules.""" deldo = CommandDelete() res_do = ADF_ARAM.store_data(self._cmd.lchan.scc._tp, deldo) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35843?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: I5a739187a8966cdb0ae5c6cbc7bc5d4115433aeb Gerrit-Change-Number: 35843 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pylint: ts_102_221.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35842?usp=email ) Change subject: pylint: ts_102_221.py ...................................................................... pylint: ts_102_221.py pySim/ts_102_221.py:20:0: W0622: Redefining built-in 'BlockingIOError' (redefined-builtin) pySim/ts_102_221.py:30:0: R0402: Use 'from pySim import iso7816_4' instead (consider-using-from-import) pySim/ts_102_221.py:20:0: W0401: Wildcard import construct (wildcard-import) pySim/ts_102_221.py:235:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/ts_102_221.py:272:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/ts_102_221.py:281:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/ts_102_221.py:484:12: W0715: Exception arguments suggest string formatting might be intended (raising-format-tuple) pySim/ts_102_221.py:486:12: W0715: Exception arguments suggest string formatting might be intended (raising-format-tuple) pySim/ts_102_221.py:488:12: W0715: Exception arguments suggest string formatting might be intended (raising-format-tuple) pySim/ts_102_221.py:523:11: C1802: Do not use `len(SEQUENCE)` without comparison to determine if a sequence is empty (use-implicit-booleaness-not-len) pySim/ts_102_221.py:647:0: W0613: Unused argument 'kwargs' (unused-argument) pySim/ts_102_221.py:747:19: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_221.py:26:0: C0411: third party import "from bidict import bidict" should be placed before "from pySim.construct import *" (wrong-import-order) pySim/ts_102_221.py:27:0: C0412: Imports from package pySim are not grouped (ungrouped-imports) pySim/ts_102_221.py:29:0: W0611: Unused match_sim imported from pySim.profile (unused-import) pySim/ts_102_221.py:34:0: W0611: Unused DF_GSM imported from pySim.ts_51_011 (unused-import) pySim/ts_102_221.py:34:0: W0611: Unused DF_TELECOM imported from pySim.ts_51_011 (unused-import) Change-Id: I99d408bdf2551527f097a04240e857728b738621 --- M pySim/ts_102_221.py 1 file changed, 49 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/35842/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 65dd87d..37b7856 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -16,22 +16,22 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. """ +from bidict import bidict -from construct import * +from construct import Select, Const, Bit, Struct, Int16ub, FlagsEnum, GreedyString, ValidationError from construct import Optional as COptional + from pySim.construct import * from pySim.utils import * from pySim.filesystem import * from pySim.tlv import * -from bidict import bidict from pySim.profile import CardProfile from pySim.profile import match_uicc -from pySim.profile import match_sim -import pySim.iso7816_4 as iso7816_4 +from pySim import iso7816_4 # A UICC will usually also support 2G functionality. If this is the case, we # need to add DF_GSM and DF_TELECOM along with the UICC related files -from pySim.ts_51_011 import DF_GSM, DF_TELECOM, AddonSIM +from pySim.ts_51_011 import AddonSIM from pySim.gsm_r import AddonGSMR from pySim.cdma_ruim import AddonRUIM @@ -234,20 +234,19 @@ def _to_bytes(self): if self.decoded == 'no_information': return b'\x00' - elif self.decoded == 'creation': + if self.decoded == 'creation': return b'\x01' - elif self.decoded == 'initialization': + if self.decoded == 'initialization': return b'\x03' - elif self.decoded == 'operational_activated': + if self.decoded == 'operational_activated': return b'\x05' - elif self.decoded == 'operational_deactivated': + if self.decoded == 'operational_deactivated': return b'\x04' - elif self.decoded == 'termination': + if self.decoded == 'termination': return b'\x0c' - elif isinstance(self.decoded, int): + if isinstance(self.decoded, int): return self.decoded.to_bytes(1, 'big') - else: - raise ValueError + raise ValueError # ETSI TS 102 221 11.1.1.4.9 class PS_DO(BER_TLV_IE, tag=0x90): @@ -481,12 +480,11 @@ def from_bytes(self, do: bytes): """Decode a Control Reference Template DO.""" if len(do) != 6: - raise ValueError('Unsupported CRT DO length: %s', do) + raise ValueError('Unsupported CRT DO length: %s' %do) if do[0] != 0x83 or do[1] != 0x01: - raise ValueError('Unsupported Key Ref Tag or Len in CRT DO %s', do) + raise ValueError('Unsupported Key Ref Tag or Len in CRT DO %s' % do) if do[3:] != b'\x95\x01\x08': - raise ValueError( - 'Unsupported Usage Qualifier Tag or Len in CRT DO %s', do) + raise ValueError('Unsupported Usage Qualifier Tag or Len in CRT DO %s' % do) self.encoded = do[0:6] self.decoded = pin_names[do[2]] return do[6:] @@ -520,7 +518,7 @@ if inb & 0x10: res.append('user_auth') rd = {'mode': cond} - if len(res): + if len(res) > 0: rd['conditions'] = res self.decoded = rd @@ -723,7 +721,7 @@ raise ValueError return by_mode - def _decode_record_bin(self, raw_bin_data, **kwargs): + def _decode_record_bin(self, raw_bin_data, **_kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) dec = arr_seq.decode_multi(raw_bin_data) @@ -731,20 +729,17 @@ # 'un-flattening' decoder, and hence would be unable to encode :( return dec[0] - def _encode_record_bin(self, in_json, **kwargs): + def _encode_record_bin(self, in_json, **_kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) return arr_seq.encode_multi(in_json) @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - @cmd2.with_argparser(LinFixedEF.ShellCommands.read_rec_dec_parser) def do_read_arr_record(self, opts): """Read one EF.ARR record in flattened, human-friendly form.""" - (data, sw) = self._cmd.lchan.read_record_dec(opts.record_nr) + (data, _sw) = self._cmd.lchan.read_record_dec(opts.record_nr) data = self._cmd.lchan.selected_file.flatten(data) self._cmd.poutput_json(data, opts.oneline) @@ -755,7 +750,7 @@ # collect all results in list so they are rendered as JSON list when printing data_list = [] for recnr in range(1, 1 + num_of_rec): - (data, sw) = self._cmd.lchan.read_record_dec(recnr) + (data, _sw) = self._cmd.lchan.read_record_dec(recnr) data = self._cmd.lchan.selected_file.flatten(data) data_list.append(data) self._cmd.poutput_json(data_list, opts.oneline) @@ -869,10 +864,10 @@ shell_cmdsets = [self.AddlShellCommands()], addons = addons) @staticmethod - def decode_select_response(resp_hex: str) -> object: + def decode_select_response(data_hex: str) -> object: """ETSI TS 102 221 Section 11.1.1.3""" t = FcpTemplate() - t.from_tlv(h2b(resp_hex)) + t.from_tlv(h2b(data_hex)) d = t.to_dict() return flatten_dict_lists(d['fcp_template']) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35842?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: I99d408bdf2551527f097a04240e857728b738621 Gerrit-Change-Number: 35842 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log February 2024