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

[S] Change in pysim[master]: pylint: cards.py

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35811?usp=email ) Change subject: pylint: cards.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35811?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: I708da28caffb417ed2f8413f9611526b18b29cd4 Gerrit-Change-Number: 35811 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 16:56:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: pylint: gsmtap.py

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35810?usp=email ) Change subject: pylint: gsmtap.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35810?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: I53739874edef0a9ae25a8599e7cc7eee9dedb703 Gerrit-Change-Number: 35810 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 16:56:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: construct: Add StripTrailerAdapter

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35806?usp=email ) Change subject: construct: Add StripTrailerAdapter ...................................................................... construct: Add StripTrailerAdapter In smart cards, we every so often encounter data types that contain a bit-mask whose length depends on whether or not there are any of the least-significant bits are set. So far we worked around this with some kind of Struct('byte1', 'byte2'/COptional, 'byte3'/COptional) approach. Let's do thisin a generic way using the new StripTrailerAdapter. Change-Id: I659aa7247c57c680895b0bf8412f9e477fc3587d --- M pySim/construct.py M pySim/global_platform/__init__.py M tests/test_construct.py 3 files changed, 97 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/construct.py b/pySim/construct.py index 988dbf3..8ef7941 100644 --- a/pySim/construct.py +++ b/pySim/construct.py @@ -365,6 +365,37 @@ ia = ipaddress.IPv6Address(obj) return ia.packed +class StripTrailerAdapter(Adapter): + """ + Encoder removes all trailing bytes matching the default_value + Decoder pads input data up to total_length with default_value + + This is used in constellations like "FlagsEnum(StripTrailerAdapter(GreedyBytes, 3), ..." + where you have a bit-mask that may have 1, 2 or 3 bytes, depending on whether or not any + of the LSBs are actually set. + """ + def __init__(self, subcon, total_length:int, default_value=b'\x00', min_len=1): + super().__init__(subcon) + assert len(default_value) == 1 + self.total_length = total_length + self.default_value = default_value + self.min_len = min_len + + def _decode(self, obj, context, path): + assert type(obj) == bytes + # pad with suppressed/missing bytes + if len(obj) < self.total_length: + obj += self.default_value * (self.total_length - len(obj)) + return int.from_bytes(obj, 'big') + + def _encode(self, obj, context, path): + assert type(obj) == int + obj = obj.to_bytes(self.total_length, 'big') + # remove trailing bytes if they are zero + while len(obj) > self.min_len and obj[-1] == self.default_value[0]: + obj = obj[:-1] + return obj + def filter_dict(d, exclude_prefix='_'): """filter the input dict to ensure no keys starting with 'exclude_prefix' remain.""" diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 494cfe1..7b5ab8f 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -124,15 +124,16 @@ pass # GP v2.3 11.1.9 -KeyUsageQualifier = Struct('byte1'/FlagsEnum(Byte, verification_encryption=0x80, - computation_decipherment=0x40, - sm_response=0x20, - sm_command=0x10, - confidentiality=0x08, - crypto_checksum=0x04, - digital_signature=0x02, - crypto_authorization=0x01), - 'byte2'/COptional(FlagsEnum(Byte, key_agreement=0x80))) +KeyUsageQualifier = FlagsEnum(StripTrailerAdapter(GreedyBytes, 2), + verification_encryption=0x8000, + computation_decipherment=0x4000, + sm_response=0x2000, + sm_command=0x1000, + confidentiality=0x0800, + crypto_checksum=0x0400, + digital_signature=0x0200, + crypto_authorization=0x0100, + key_agreement=0x0080) # GP v2.3 11.1.10 KeyAccess = Enum(Byte, sd_and_any_assoc_app=0x00, sd_only=0x01, any_assoc_app_but_not_sd=0x02, @@ -210,13 +211,13 @@ class CiphersForLFDBEncryption(BER_TLV_IE, tag=0x84): _construct = Enum(Byte, tripledes16=0x01, aes128=0x02, aes192=0x04, aes256=0x08, icv_supported_for_lfdb=0x80) -CipherSuitesForSignatures = Struct('byte1'/FlagsEnum(Byte, rsa1024_pkcsv15_sha1=0x01, - rsa_gt1024_pss_sha256=0x02, - single_des_plus_final_triple_des_mac_16b=0x04, - cmac_aes128=0x08, cmac_aes192=0x10, cmac_aes256=0x20, - ecdsa_ecc256_sha256=0x40, ecdsa_ecc384_sha384=0x80), - 'byte2'/COptional(FlagsEnum(Byte, ecdsa_ecc512_sha512=0x01, - ecdsa_ecc_521_sha512=0x02))) +CipherSuitesForSignatures = FlagsEnum(StripTrailerAdapter(GreedyBytes, 2), + rsa1024_pkcsv15_sha1=0x0100, + rsa_gt1024_pss_sha256=0x0200, + single_des_plus_final_triple_des_mac_16b=0x0400, + cmac_aes128=0x0800, cmac_aes192=0x1000, cmac_aes256=0x2000, + ecdsa_ecc256_sha256=0x4000, ecdsa_ecc384_sha384=0x8000, + ecdsa_ecc512_sha512=0x0001, ecdsa_ecc_521_sha512=0x0002) class CiphersForTokens(BER_TLV_IE, tag=0x85): _construct = CipherSuitesForSignatures class CiphersForReceipts(BER_TLV_IE, tag=0x86): @@ -387,15 +388,16 @@ # Section 11.4.3.1 Table 11-36 + Section 11.1.2 class Privileges(BER_TLV_IE, tag=0xc5): - _construct = Struct('byte1'/FlagsEnum(Byte, security_domain=0x80, dap_verification=0x40, - delegated_management=0x20, card_lock=0x10, card_terminate=0x08, - card_reset=0x04, cvm_management=0x02, - mandated_dap_verification=0x01), - 'byte2'/COptional(FlagsEnum(Byte, trusted_path=0x80, authorized_management=0x40, - token_management=0x20, global_delete=0x10, global_lock=0x08, - global_registry=0x04, final_application=0x02, global_service=0x01)), - 'byte3'/COptional(FlagsEnum(Byte, receipt_generation=0x80, ciphered_load_file_data_block=0x40, - contactless_activation=0x20, contactless_self_activation=0x10))) + _construct = FlagsEnum(StripTrailerAdapter(GreedyBytes, 3), + security_domain=0x800000, dap_verification=0x400000, + delegated_management=0x200000, card_lock=0x100000, card_terminate=0x080000, + card_reset=0x040000, cvm_management=0x020000, + mandated_dap_verification=0x010000, + trusted_path=0x8000, authorized_management=0x4000, + token_management=0x2000, global_delete=0x1000, global_lock=0x0800, + global_registry=0x0400, final_application=0x0200, global_service=0x0100, + receipt_generation=0x80, ciphered_load_file_data_block=0x40, + contactless_activation=0x20, contactless_self_activation=0x10) # Section 11.4.3.1 Table 11-36 + Section 11.1.7 class ImplicitSelectionParameter(BER_TLV_IE, tag=0xcf): diff --git a/tests/test_construct.py b/tests/test_construct.py index 11822a8..6251a14 100644 --- a/tests/test_construct.py +++ b/tests/test_construct.py @@ -1,7 +1,9 @@ #!/usr/bin/env python3 import unittest +from pySim.utils import b2h, h2b from pySim.construct import * +from construct import FlagsEnum tests = [ ( b'\x80', 0x80 ), @@ -75,6 +77,26 @@ re_enc = self.ad._encode(string, None, None) self.assertEqual(encoded, re_enc) +class TestTrailerAdapter(unittest.TestCase): + Privileges = FlagsEnum(StripTrailerAdapter(GreedyBytes, 3), security_domain=0x800000, + dap_verification=0x400000, + delegated_management=0x200000, card_lock=0x100000, + card_terminate=0x080000, card_reset=0x040000, + cvm_management=0x020000, mandated_dap_verification=0x010000, + trusted_path=0x8000, authorized_management=0x4000, + token_management=0x2000, global_delete=0x1000, + global_lock=0x0800, global_registry=0x0400, + final_application=0x0200, global_service=0x0100, + receipt_generation=0x80, ciphered_load_file_data_block=0x40, + contactless_activation=0x20, contactless_self_activation=0x10) + examples = ['00', '80', '8040', '400010'] + def test_examples(self): + for e in self.examples: + dec = self.Privileges.parse(h2b(e)) + reenc = self.Privileges.build(dec) + self.assertEqual(e, b2h(reenc)) + + if __name__ == "__main__": -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35806?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: I659aa7247c57c680895b0bf8412f9e477fc3587d Gerrit-Change-Number: 35806 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: global_platform: INSTALL [for install] support

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35807?usp=email ) Change subject: global_platform: INSTALL [for install] support ...................................................................... global_platform: INSTALL [for install] support Change-Id: I4c1da90f1aa8ad9609602272f374078d1e1faa11 --- M docs/shell.rst M pySim/global_platform/__init__.py 2 files changed, 54 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 42dfe1b..d86f500 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -977,6 +977,12 @@ :module: pySim.global_platform :func: ADF_SD.AddlShellCommands.inst_perso_parser +install_for_install +~~~~~~~~~~~~~~~~~~~ +.. argparse:: + :module: pySim.global_platform + :func: ADF_SD.AddlShellCommands.inst_inst_parser + delete_card_content ~~~~~~~~~~~~~~~~~~~ .. argparse:: diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 7b5ab8f..6d69796 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -18,7 +18,7 @@ """ from construct import Optional as COptional -from construct import Struct, GreedyRange, FlagsEnum, Int16ub, Padding, Bit, Const +from construct import Struct, GreedyRange, FlagsEnum, Int16ub, Int24ub, Padding, Bit, Const from typing import Optional, List, Dict, Tuple from copy import deepcopy from bidict import bidict @@ -388,7 +388,8 @@ # Section 11.4.3.1 Table 11-36 + Section 11.1.2 class Privileges(BER_TLV_IE, tag=0xc5): - _construct = FlagsEnum(StripTrailerAdapter(GreedyBytes, 3), + # we only support 3-byte encoding. Can't use StripTrailerAdapter as length==2 is not permitted. sigh. + _construct = FlagsEnum(Int24ub, security_domain=0x800000, dap_verification=0x400000, delegated_management=0x200000, card_lock=0x100000, card_terminate=0x080000, card_reset=0x040000, cvm_management=0x020000, @@ -624,11 +625,46 @@ @cmd2.with_argparser(inst_perso_parser) def do_install_for_personalization(self, opts): - """Perform GlobalPlatform INSTALL [for personalization] command in order toinform a Security + """Perform GlobalPlatform INSTALL [for personalization] command in order to inform a Security Domain that the following STORE DATA commands are meant for a specific AID (specified here).""" # Section 11.5.2.3.6 / Table 11-47 self.install(0x20, 0x00, "0000%02u%s000000" % (len(opts.application_aid)//2, opts.application_aid)) + inst_inst_parser = argparse.ArgumentParser() + inst_inst_parser.add_argument('--load-file-aid', type=is_hexstr, default='', + help='Executable Load File AID') + inst_inst_parser.add_argument('--module-aid', type=is_hexstr, default='', + help='Executable Module AID') + inst_inst_parser.add_argument('--application-aid', type=is_hexstr, required=True, + help='Application AID') + inst_inst_parser.add_argument('--install-parameters', type=is_hexstr, default='', + help='Install Parameters') + inst_inst_parser.add_argument('--privilege', action='append', dest='privileges', default=[], + choices=Privileges._construct.flags.keys(), + help='Privilege granted to newly installed Application') + inst_inst_parser.add_argument('--install-token', type=is_hexstr, default='', + help='Install Token (Section GPCS C.4.2/C.4.7)') + inst_inst_parser.add_argument('--make-selectable', action='store_true', + help='Install and make selectable') + + @cmd2.with_argparser(inst_inst_parser) + def do_install_for_install(self, opts): + """Perform GlobalPlatform INSTALL [for install] command in order to install an application.""" + InstallForInstallCD = Struct('load_file_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), + 'module_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), + 'application_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), + 'privileges'/Prefixed(Int8ub, Privileges._construct), + 'install_parameters'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), + 'install_token'/HexAdapter(Prefixed(Int8ub, GreedyBytes))) + p1 = 0x04 + if opts.make_selectable: + p1 |= 0x08 + decoded = vars(opts) + # convert from list to "true-dict" as required by construct.FlagsEnum + decoded['privileges'] = {x: True for x in decoded['privileges']} + ifi_bytes = build_construct(InstallForInstallCD, decoded) + self.install(p1, 0x00, b2h(ifi_bytes)) + def install(self, p1:int, p2:int, data:Hexstr) -> ResTuple: cmd_hex = "80E6%02x%02x%02x%s" % (p1, p2, len(data)//2, data) return self._cmd.lchan.scc.send_apdu_checksw(cmd_hex) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35807?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: I4c1da90f1aa8ad9609602272f374078d1e1faa11 Gerrit-Change-Number: 35807 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: global_platform: Add DEK (key) encryption support

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35808?usp=email ) Change subject: global_platform: Add DEK (key) encryption support ...................................................................... global_platform: Add DEK (key) encryption support Change-Id: I940cc2e16a1d3e3cdef4ebcf3f15fc2c8de21284 --- M pySim/global_platform/__init__.py M pySim/global_platform/scp.py 2 files changed, 71 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 6d69796..6f72bdc 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -544,7 +544,13 @@ else: kcv_bin = compute_kcv(opts.key_type[i], h2b(opts.key_data[i])) or b'' kcv = b2h(kcv_bin) - kdb.append({'key_type': opts.key_type[i], 'kcb': opts.key_data[i], 'kcv': kcv}) + if self._cmd.lchan.scc.scp: + # encrypte key data with DEK of current SCP + kcb = b2h(self._cmd.lchan.scc.scp.card_keys.encrypt_key(h2b(opts.key_data[i]))) + else: + # (for example) during personalization, DEK might not be required) + kcb = opts.key_data[i] + kdb.append({'key_type': opts.key_type[i], 'kcb': kcb, 'kcv': kcv}) p2 = opts.key_id if len(opts.key_type) > 1: p2 |= 0x80 diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index b8ac122..4e64e41 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -22,7 +22,7 @@ from Cryptodome.Util.strxor import strxor from construct import Struct, Bytes, Int8ub, Int16ub, Const from construct import Optional as COptional -from pySim.utils import b2h +from pySim.utils import b2h, bertlv_parse_len, bertlv_encode_len from pySim.secure_channel import SecureChannel from typing import Optional @@ -59,6 +59,7 @@ DERIV_CONST_RMAC = b'\x01\x02' DERIV_CONST_ENC = b'\x01\x82' DERIV_CONST_DENC = b'\x01\x81' + blocksize = 8 def calc_mac_1des(self, data: bytes, reset_icv: bool = False) -> bytes: """Pad and calculate MAC according to B.1.2.2 - Single DES plus final 3DES""" @@ -175,6 +176,43 @@ def gen_ext_auth_apdu(self, security_level: int = 0x01) -> bytes: pass + def encrypt_key(self, key: bytes) -> bytes: + """Encrypt a key with the DEK.""" + 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) + + def decrypt_key(self, encrypted_key:bytes) -> bytes: + """Decrypt a key with the DEK.""" + if len(encrypted_key) % self.sk.blocksize: + # If the length of the Key Component Block is not a multiple of the block size of the encryption # + # algorithm (i.e. 8 bytes for DES, 16 bytes for AES), then it shall be assumed that the key + # component value was right-padded prior to encryption and that the Key Component Block was + # formatted as described in Table 11-70. In this case, the first byte(s) of the Key Component + # Block provides the actual length of the key component value, which allows recovering the + # clear-text key component value after decryption of the encrypted key component value and removal + # of padding bytes. + decrypted = self.dek_decrypt(encrypted_key) + key_len, remainder = bertlv_parse_len(decrypted) + return remainder[:key_len] + else: + # If the length of the Key Component Block is a multiple of the block size of the encryption + # algorithm (i.e. 8 bytes for DES, 16 bytes for AES), then it shall be assumed that no padding + # bytes were added before encrypting the key component value and that the Key Component Block is + # only composed of the encrypted key component value (as shown in Table 11-71). In this case, the + # clear-text key component value is simply recovered by decrypting the Key Component Block. + return self.dek_decrypt(encrypted_key) + + @abc.abstractmethod + def dek_encrypt(self, plaintext:bytes) -> bytes: + pass + + @abc.abstractmethod + def dek_decrypt(self, ciphertext:bytes) -> bytes: + pass + class SCP02(SCP): """An instance of the GlobalPlatform SCP02 secure channel protocol.""" @@ -183,6 +221,14 @@ 'seq_counter'/Int16ub, 'card_challenge'/Bytes(6), 'card_cryptogram'/Bytes(8)) kvn_range = [0x20, 0x2f] + def dek_encrypt(self, plaintext:bytes) -> bytes: + cipher = DES.new(self.card_keys.dek, DES.MODE_ECB) + return cipher.encrypt(plaintext) + + def dek_decrypt(self, ciphertext:bytes) -> bytes: + cipher = DES.new(self.card_keys.dek, DES.MODE_ECB) + return cipher.decrypt(ciphertext) + def _compute_cryptograms(self, card_challenge: bytes, host_challenge: bytes): logger.debug("host_challenge(%s), card_challenge(%s)", b2h(host_challenge), b2h(card_challenge)) self.host_cryptogram = self.sk.calc_mac_3des(self.sk.counter.to_bytes(2, 'big') + card_challenge + host_challenge) @@ -369,6 +415,14 @@ self.s_mode = kwargs.pop('s_mode', 8) super().__init__(*args, **kwargs) + def dek_encrypt(self, plaintext:bytes) -> bytes: + cipher = AES.new(self.card_keys.dek, AES.MODE_CBC, b'\x00'*16) + return cipher.encrypt(plaintext) + + def dek_decrypt(self, ciphertext:bytes) -> bytes: + cipher = AES.new(self.card_keys.dek, AES.MODE_CBC, b'\x00'*16) + return cipher.decrypt(ciphertext) + def _compute_cryptograms(self): logger.debug("host_challenge(%s), card_challenge(%s)", b2h(self.host_challenge), b2h(self.card_challenge)) # Card + Host Authentication Cryptogram: Section 6.2.2.2 + 6.2.2.3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35808?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: I940cc2e16a1d3e3cdef4ebcf3f15fc2c8de21284 Gerrit-Change-Number: 35808 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: pylint: card_key_provider.py, card_handler.py, iso7816_4.py, jsonpath.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35809?usp=email ) Change subject: pylint: card_key_provider.py, card_handler.py, iso7816_4.py, jsonpath.py ...................................................................... pylint: card_key_provider.py, card_handler.py, iso7816_4.py, jsonpath.py pySim/card_key_provider.py:57:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/card_key_provider.py:61:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/card_handler.py:100:0: C0325: Unnecessary parens after '=' keyword (superfluous-parens) pySim/card_handler.py:100:24: C0121: Comparison 'self.cmds.get('verbose') == True' should be 'self.cmds.get('verbose') is True' if checking for the singleton value True, or 'bool(self.cmds.get('verbose'))' if testing for truthiness (singleton-comparison) pySim/card_handler.py:29:0: C0411: standard import "import subprocess" should be placed before "from pySim.transport import LinkBase" (wrong-import-order) pySim/card_handler.py:30:0: C0411: standard import "import sys" should be placed before "from pySim.transport import LinkBase" (wrong-import-order) pySim/card_handler.py:31:0: C0411: third party import "import yaml" should be placed before "from pySim.transport import LinkBase" (wrong-import-order) pySim/iso7816_4.py:20:0: W0401: Wildcard import construct (wildcard-import) pySim/jsonpath.py:1:0: C0114: Missing module docstring (missing-module-docstring) pySim/jsonpath.py:6:0: W0105: String statement has no effect (pointless-string-statement) pySim/jsonpath.py:2:0: W0611: Unused import json (unused-import) pySim/jsonpath.py:3:0: W0611: Unused import pprint (unused-import) Change-Id: I780595d69000f727ad0fbaff4b89918b91b3122e --- M pySim/card_handler.py M pySim/card_key_provider.py M pySim/iso7816_4.py M pySim/jsonpath.py 4 files changed, 32 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/card_handler.py b/pySim/card_handler.py index 57e0d32..e7884ad 100644 --- a/pySim/card_handler.py +++ b/pySim/card_handler.py @@ -24,12 +24,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from pySim.transport import LinkBase - import subprocess import sys import yaml +from pySim.transport import LinkBase class CardHandlerBase: """Abstract base class representing a mechanism for card insertion/removal.""" @@ -97,7 +96,7 @@ print("Card handler Config-file: " + str(config_file)) with open(config_file) as cfg: self.cmds = yaml.load(cfg, Loader=yaml.FullLoader) - self.verbose = (self.cmds.get('verbose') == True) + self.verbose = self.cmds.get('verbose') is True def __print_outout(self, out): print("") diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index 00e32aa..33a2a3d 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -54,11 +54,11 @@ dictionary of {field, value} strings for each requested field from 'fields' """ for f in fields: - if (f not in self.VALID_FIELD_NAMES): + if f not in self.VALID_FIELD_NAMES: raise ValueError("Requested field name '%s' is not a valid field name, valid field names are: %s" % (f, str(self.VALID_FIELD_NAMES))) - if (key not in self.VALID_FIELD_NAMES): + if key not in self.VALID_FIELD_NAMES: raise ValueError("Key field name '%s' is not a valid field name, valid field names are: %s" % (key, str(self.VALID_FIELD_NAMES))) diff --git a/pySim/iso7816_4.py b/pySim/iso7816_4.py index 1da5809..64d814d 100644 --- a/pySim/iso7816_4.py +++ b/pySim/iso7816_4.py @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from construct import * +from construct import GreedyBytes, GreedyString from pySim.construct import * from pySim.utils import * from pySim.filesystem import * diff --git a/pySim/jsonpath.py b/pySim/jsonpath.py index 4dd838c..5778de9 100644 --- a/pySim/jsonpath.py +++ b/pySim/jsonpath.py @@ -1,8 +1,3 @@ -# coding=utf-8 -import json -import pprint -import jsonpath_ng - """JSONpath utility functions as needed within pysim. As pySim-sell has the ability to represent SIM files as JSON strings, @@ -10,6 +5,8 @@ of a file or record in its JSON representation. """ +import jsonpath_ng + # (C) 2021 by Harald Welte <laforge(a)osmocom.org> # # This program is free software: you can redistribute it and/or modify -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35809?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: I780595d69000f727ad0fbaff4b89918b91b3122e Gerrit-Change-Number: 35809 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: pylint: card_key_provider.py, card_handler.py, iso7816_4.py, jsonpath.py

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35809?usp=email ) Change subject: pylint: card_key_provider.py, card_handler.py, iso7816_4.py, jsonpath.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35809?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: I780595d69000f727ad0fbaff4b89918b91b3122e Gerrit-Change-Number: 35809 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 16:56:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: global_platform: Add DEK (key) encryption support

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35808?usp=email ) Change subject: global_platform: Add DEK (key) encryption support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35808?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: I940cc2e16a1d3e3cdef4ebcf3f15fc2c8de21284 Gerrit-Change-Number: 35808 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 16:56:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: global_platform: INSTALL [for install] support

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35807?usp=email ) Change subject: global_platform: INSTALL [for install] support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35807?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: I4c1da90f1aa8ad9609602272f374078d1e1faa11 Gerrit-Change-Number: 35807 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 16:56:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: construct: Add StripTrailerAdapter

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35806?usp=email ) Change subject: construct: Add StripTrailerAdapter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35806?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: I659aa7247c57c680895b0bf8412f9e477fc3587d Gerrit-Change-Number: 35806 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 16:55:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024