May 2026 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: card_key_provider: add a static method to parse --column-keys args
by laforge 07 May '26

07 May '26

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/42736?usp=email ) Change subject: card_key_provider: add a static method to parse --column-keys args ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42736?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic955f271b1de1b1b855b21c82ed10343044e45fa Gerrit-Change-Number: 42736 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 May 2026 19:14:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in pysim[master]: card_key_provider: move boiler-plate code into helper functions
by laforge 07 May '26

07 May '26

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/42734?usp=email ) Change subject: card_key_provider: move boiler-plate code into helper functions ...................................................................... Patch Set 1: (2 comments) File pySim/card_key_provider.py: https://gerrit.osmocom.org/c/pysim/+/42734/comment/a171cd51_581e4a6c?usp=em… : PS1, Line 337: def argparse_add_card_key_provider_args(arg_parser: argparse.ArgumentParser): to be consistent with other methods I would call it card_key_provider_argparse_add_args or something like that. Then all methods have the same prefix https://gerrit.osmocom.org/c/pysim/+/42734/comment/e78c1b9e_8d4d5e12?usp=em… : PS1, Line 344: init_card_key_provider likewise here I'd call it card_key_provider_init similar to card_key_provider_{get,get_field} above -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6d095cbb644e608f4a751a1d0749b1484cdc781d Gerrit-Change-Number: 42734 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 May 2026 19:13:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in pysim[master]: cosmetic: remove excess linebreaks
by laforge 07 May '26

07 May '26

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/42733?usp=email ) Change subject: cosmetic: remove excess linebreaks ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/42733/comment/690729c8_33315b07?usp=em… : PS1, Line 1131: I think it's useful to sepaate the "main" block from class definitions with an extra line. Not sure why you think this needs our attention or "fixing". File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/42733/comment/94822749_fa7eabef?usp=em… : PS1, Line 28: I'm not quite sure what you are trying to achieve here. I think it's not uncommon to have an empty line to separate imporst from foreign modules to imports from within a project (pysim here). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2272abcdbba0e57c5118b69bc9398cd909a469b5 Gerrit-Change-Number: 42733 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 May 2026 19:11:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: card_key_provider: add a static method to parse --column-keys args
by dexter 07 May '26

07 May '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42736?usp=email ) Change subject: card_key_provider: add a static method to parse --column-keys args ...................................................................... card_key_provider: add a static method to parse --column-keys args The contents of the --column-keys arguments are currently parsed in init_card_key_provider. Let's add a static method in CardKeyFieldCryptor to simplify re-usage of the CardKeyFieldCryptor Related: SYS#6959 Change-Id: Ic955f271b1de1b1b855b21c82ed10343044e45fa --- M pySim/card_key_provider.py 1 file changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/42736/1 diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index ecf8c40..7c89b6b 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -140,6 +140,23 @@ arg_parser.add_argument('--csv-column-key', metavar='FIELD:AES_KEY_HEX', default=[], action='append', help=argparse.SUPPRESS, dest='column_key') + @staticmethod + def transport_keys_from_opts(opts: argparse.Namespace) -> dict: + """ + Transport keys are passed via the commandline using the '--column-key' option. Each column requires a + dedicated transport key. This method can be used to extract the column keys parameters from the commandline + options into a dict that can be directly passed to the construtor with the transport_keys argument. + + Args: + opts: parsed commandline options (Namespace) + """ + + transport_keys = {} + for par in opts.column_key: + name, key = par.split(':') + transport_keys[name] = key + return transport_keys + class CardKeyProvider(abc.ABC): """Base class, not containing any concrete implementation.""" @@ -343,10 +360,7 @@ def init_card_key_provider(opts: argparse.Namespace): """Initialize card key provider depending on the user provided commandline options""" - column_keys = {} - for par in opts.column_key: - name, key = par.split(':') - column_keys[name] = key + transport_keys = CardKeyFieldCryptor.transport_keys_from_opts(opts) card_key_field_cryptor = CardKeyFieldCryptor(transport_keys) if os.path.isfile(os.path.expanduser(opts.csv)): card_key_provider_register(CardKeyProviderCsv(os.path.expanduser(opts.csv), card_key_field_cryptor)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42736?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic955f271b1de1b1b855b21c82ed10343044e45fa Gerrit-Change-Number: 42736 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySimLogger: fix default log format string
by dexter 07 May '26

07 May '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42737?usp=email ) Change subject: pySimLogger: fix default log format string ...................................................................... pySimLogger: fix default log format string In format string we prepend when we log in verbose mode. We use %(module)s as format string quaifier. This qualifier is replaced with the name of the module from where the logger was called. This is mostly equal to the logger name (__name__) we pass when we create the logger. However, this is not the behavior we actually want. We want to log the logger name that we passed when the logger was created. For this, we must use %(name)s as qualifier. Related: SYS#6959 Change-Id: I3951a70ad6ce864a7158b093cba46ae9fc1cb5bd --- M pySim/log.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/37/42737/1 diff --git a/pySim/log.py b/pySim/log.py index 801ad69..345cf78 100644 --- a/pySim/log.py +++ b/pySim/log.py @@ -44,7 +44,7 @@ """ LOG_FMTSTR = "%(levelname)s: %(message)s" - LOG_FMTSTR_VERBOSE = "%(module)s.%(lineno)d -- " + LOG_FMTSTR + LOG_FMTSTR_VERBOSE = "%(name)s.%(lineno)d -- " + LOG_FMTSTR __formatter = logging.Formatter(LOG_FMTSTR) __formatter_verbose = logging.Formatter(LOG_FMTSTR_VERBOSE) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42737?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3951a70ad6ce864a7158b093cba46ae9fc1cb5bd Gerrit-Change-Number: 42737 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in pysim[master]: pySim/app: use pySimLogger instead of print
by dexter 07 May '26

07 May '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42738?usp=email ) Change subject: pySim/app: use pySimLogger instead of print ...................................................................... pySim/app: use pySimLogger instead of print let's replace the stray print statements with proper logger calls. Related: SYS#6959 Change-Id: I95b4536cc8853e7ba6a5dd573b903dfb85e56b9a --- M pySim/app.py 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/38/42738/1 diff --git a/pySim/app.py b/pySim/app.py index 23a4c3c..4e88788 100644 --- a/pySim/app.py +++ b/pySim/app.py @@ -26,6 +26,9 @@ from pySim.ts_102_221 import CardProfileUICC from pySim.utils import all_subclasses from pySim.exceptions import SwMatchError +from pySim.log import PySimLogger + +log = PySimLogger.get(__name__) # we need to import this module so that the SysmocomSJA2 sub-class of # CardModel is created, which will add the ATR-based matching and @@ -54,7 +57,7 @@ # Wait up to three seconds for a card in reader and try to detect # the card type. - print("Waiting for card...") + log.info("Waiting for card...") sl.wait_for_card(3) # The user may opt to skip all card initialization. In this case only the @@ -66,7 +69,7 @@ generic_card = False card = card_detect(scc) if card is None: - print("Warning: Could not detect card type - assuming a generic card type...") + log.warning("Could not detect card type - assuming a generic card type...") card = SimCardBase(scc) generic_card = True @@ -76,7 +79,7 @@ # just means that pySim was unable to recognize the card profile. This # may happen in particular with unprovisioned cards that do not have # any files on them yet. - print("Unsupported card type!") + log.warning("Unsupported card type!") return None, card # ETSI TS 102 221, Table 9.3 specifies a default for the PIN key @@ -87,7 +90,7 @@ if generic_card and isinstance(profile, CardProfileUICC): card._adm_chv_num = 0x0A - print("Info: Card is of type: %s" % str(profile)) + log.info("Card is of type: %s", str(profile)) # FIXME: this shouldn't really be here but somewhere else/more generic. # We cannot do it within pySim/profile.py as that would create circular -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I95b4536cc8853e7ba6a5dd573b903dfb85e56b9a Gerrit-Change-Number: 42738 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in pysim[master]: pySim/scp: migrate to pySimLogger
by dexter 07 May '26

07 May '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42740?usp=email ) Change subject: pySim/scp: migrate to pySimLogger ...................................................................... pySim/scp: migrate to pySimLogger The module scp.py predates the existence of the pySimLogger and still uses an individually created logger. Let's migrate to pySimLogger to avoid unexpected effects and to be uniform with the other modules. Related: SYS#6959 Change-Id: I5db7180f93f116dd2d99c33da264f74ea16a1a37 --- M pySim/global_platform/scp.py 1 file changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/42740/1 diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 6c267fa..a5fcf51 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -27,9 +27,9 @@ from osmocom.tlv import bertlv_parse_len, bertlv_encode_len from pySim.utils import parse_command_apdu from pySim.secure_channel import SecureChannel +from pySim.log import PySimLogger -logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG) +log = PySimLogger.get(__name__) def scp02_key_derivation(constant: bytes, counter: int, base_key: bytes) -> bytes: assert len(constant) == 2 @@ -75,7 +75,7 @@ h = e.encrypt(strxor(h, bytes(padded_data[8*i:8*(i+1)]))) h = d.decrypt(h) h = e.encrypt(h) - logger.debug("mac_1des(%s,icv=%s) -> %s", b2h(data), b2h(icv), b2h(h)) + log.debug("mac_1des(%s,icv=%s) -> %s", b2h(data), b2h(icv), b2h(h)) if self.des_icv_enc: self.icv = self.des_icv_enc.encrypt(h) else: @@ -89,7 +89,7 @@ h = b'\x00' * 8 for i in range(q): h = e.encrypt(strxor(h, bytes(padded_data[8*i:8*(i+1)]))) - logger.debug("mac_3des(%s) -> %s", b2h(data), b2h(h)) + log.debug("mac_3des(%s) -> %s", b2h(data), b2h(h)) return h def __init__(self, counter: int, card_keys: 'GpCardKeyset', icv_encrypt=True): @@ -276,10 +276,10 @@ 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)) + log.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) self.card_cryptogram = self.sk.calc_mac_3des(self.host_challenge + self.sk.counter.to_bytes(2, 'big') + card_challenge) - logger.debug("host_cryptogram(%s), card_cryptogram(%s)", b2h(self.host_cryptogram), b2h(self.card_cryptogram)) + log.debug("host_cryptogram(%s), card_cryptogram(%s)", b2h(self.host_cryptogram), b2h(self.card_cryptogram)) def gen_init_update_apdu(self, host_challenge: bytes = b'\x00'*8) -> bytes: """Generate INITIALIZE UPDATE APDU.""" @@ -291,7 +291,7 @@ resp = self.constr_iur.parse(resp_bin) self.card_challenge = resp['card_challenge'] self.sk = Scp02SessionKeys(resp['seq_counter'], self.card_keys) - logger.debug(self.sk) + log.debug(self.sk) self._compute_cryptograms(self.card_challenge, self.host_challenge) if self.card_cryptogram != resp['card_cryptogram']: raise ValueError("card cryptogram doesn't match") @@ -311,7 +311,7 @@ def _wrap_cmd_apdu(self, apdu: bytes, *args, **kwargs) -> bytes: """Wrap Command APDU for SCP02: calculate MAC and encrypt.""" - logger.debug("wrap_cmd_apdu(%s)", b2h(apdu)) + log.debug("wrap_cmd_apdu(%s)", b2h(apdu)) if not self.do_cmac: return apdu @@ -378,7 +378,7 @@ 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) + log.debug("scp03_kdf(constant=%s, context=%s, base_key=%s, l=%u)", b2h(constant), b2h(context), b2h(base_key), l) output_len = l // 8 # SCP03 Section 4.1.5 defines a different parameter order than NIST SP 800-108, so we cannot use the # existing Cryptodome.Protocol.KDF.SP800_108_Counter function :( @@ -451,7 +451,7 @@ # This block SHALL be encrypted with S-ENC to produce the ICV for command encryption. cipher = AES.new(self.s_enc, AES.MODE_CBC, iv) icv = cipher.encrypt(data) - logger.debug("_get_icv(data=%s, is_resp=%s) -> icv=%s", b2h(data), is_response, b2h(icv)) + log.debug("_get_icv(data=%s, is_resp=%s) -> icv=%s", b2h(data), is_response, b2h(icv)) return icv # TODO: Resolve duplication with pySim.esim.bsp.BspAlgoCryptAES128 which provides pad80-wrapping @@ -489,12 +489,12 @@ return cipher.decrypt(ciphertext) def _compute_cryptograms(self): - logger.debug("host_challenge(%s), card_challenge(%s)", b2h(self.host_challenge), b2h(self.card_challenge)) + log.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 context = self.host_challenge + self.card_challenge self.card_cryptogram = scp03_key_derivation(self.sk.DERIV_CONST_AUTH_CGRAM_CARD, context, self.sk.s_mac, l=self.s_mode*8) self.host_cryptogram = scp03_key_derivation(self.sk.DERIV_CONST_AUTH_CGRAM_HOST, context, self.sk.s_mac, l=self.s_mode*8) - logger.debug("host_cryptogram(%s), card_cryptogram(%s)", b2h(self.host_cryptogram), b2h(self.card_cryptogram)) + log.debug("host_cryptogram(%s), card_cryptogram(%s)", b2h(self.host_cryptogram), b2h(self.card_cryptogram)) def gen_init_update_apdu(self, host_challenge: Optional[bytes] = None) -> bytes: """Generate INITIALIZE UPDATE APDU.""" @@ -514,7 +514,7 @@ self.i_param = resp['i_param'] # derive session keys and compute cryptograms self.sk = Scp03SessionKeys(self.card_keys, self.host_challenge, self.card_challenge) - logger.debug(self.sk) + log.debug(self.sk) self._compute_cryptograms() # verify computed cryptogram matches received cryptogram if self.card_cryptogram != resp['card_cryptogram']: @@ -529,7 +529,7 @@ def _wrap_cmd_apdu(self, apdu: bytes, skip_cenc: bool = False) -> bytes: """Wrap Command APDU for SCP03: calculate MAC and encrypt.""" - logger.debug("wrap_cmd_apdu(%s)", b2h(apdu)) + log.debug("wrap_cmd_apdu(%s)", b2h(apdu)) if not self.do_cmac: return apdu @@ -584,7 +584,7 @@ # 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, rsp_apdu=%s)", sw, rsp_apdu) + log.debug("unwrap_rsp_apdu(sw=%s, rsp_apdu=%s)", sw, rsp_apdu) if not self.do_rmac: assert not self.do_renc return rsp_apdu @@ -600,9 +600,9 @@ if self.do_renc: # decrypt response data decrypted = self.sk._decrypt(response_data) - logger.debug("decrypted: %s", b2h(decrypted)) + log.debug("decrypted: %s", b2h(decrypted)) # remove padding response_data = unpad80(decrypted) - logger.debug("response_data: %s", b2h(response_data)) + log.debug("response_data: %s", b2h(response_data)) return response_data -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5db7180f93f116dd2d99c33da264f74ea16a1a37 Gerrit-Change-Number: 42740 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim/filesystem: use pySimLogger instead of print
by dexter 07 May '26

07 May '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42739?usp=email ) Change subject: pySim/filesystem: use pySimLogger instead of print ...................................................................... pySim/filesystem: use pySimLogger instead of print let's replace the stray print statements with proper logger calls. Related: SYS#6959 Change-Id: I3a7188ad33706df66b2113e15cc7d06004c9bc39 --- M pySim/filesystem.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/42739/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 95fae36..04806cb 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -44,6 +44,7 @@ from pySim.jsonpath import js_path_modify from pySim.commands import SimCardCommands from pySim.exceptions import SwMatchError +from pySim.log import PySimLogger # int: a single service is associated with this file # list: any of the listed services requires this file @@ -52,6 +53,8 @@ Size = Tuple[int, Optional[int]] +log = PySimLogger.get(__name__) + class CardFile: """Base class for all objects in the smart card filesystem. Serve as a common ancestor to all other file types; rarely used directly. @@ -1609,14 +1612,14 @@ card_atr = scc.get_atr() for atr in cls._atrs: if atr == card_atr: - print("Detected CardModel:", cls.__name__) + log.info("Detected CardModel: %s", cls.__name__) return True # if nothing found try to just compare the Historical Bytes of the ATR card_atr_hb = decomposeATR(card_atr)['hb'] for atr in cls._atrs: atr_hb = decomposeATR(atr)['hb'] if atr_hb == card_atr_hb: - print("Detected CardModel:", cls.__name__) + log.info("Detected CardModel: %s", cls.__name__) return True return False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3a7188ad33706df66b2113e15cc7d06004c9bc39 Gerrit-Change-Number: 42739 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[L] Change in pysim[master]: pySim/global_platform: make functionality available outside of cmd2
by dexter 07 May '26

07 May '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42741?usp=email ) Change subject: pySim/global_platform: make functionality available outside of cmd2 ...................................................................... pySim/global_platform: make functionality available outside of cmd2 The nested class AddlShellCommands holds methods that encapsulate the actual functionality from the related do_ method (e.g. do_store_data calls self.store_data). This is already a good level of separation but it does not allow us to call those methods from programs that are not based on cmd2. Let's turn those methods into functions so that non cmd2 applications have easy access to the functionality of pySim.global_platform. Let's also add a pySimLogger, so that we do not have to call self._cmd.poutput Related: SYS#6959 Change-Id: Idf4e4b58bf49ba62b2c22de4c49a2dcacfa872cb --- M pySim/global_platform/__init__.py 1 file changed, 140 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/42741/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 306746f..e836e08 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -35,6 +35,10 @@ from pySim.profile import CardProfile from pySim.ota import SimFileAccessAndToolkitAppSpecParams from pySim.javacard import CapFile +from pySim.runtime import RuntimeLchan +from pySim.log import PySimLogger + +log = PySimLogger.get(__name__) # GPCS Table 11-48 Load Parameter Tags class NonVolatileCodeMinMemoryReq(BER_TLV_IE, tag=0xC6): @@ -543,7 +547,8 @@ self._cmd.poutput('Unknown data object "%s", available options: %s' % (tlv_cls_name, do_names)) return - (data, _sw) = self._cmd.lchan.scc.get_data(cla=0x80, tag=tlv_cls.tag) + + data = get_data(self._cmd.lchan, tag=tlv_cls.tag) ie = tlv_cls() ie.from_tlv(h2b(data)) self._cmd.poutput_json(ie.to_dict()) @@ -564,27 +569,7 @@ """Perform the GlobalPlatform STORE DATA command in order to store some card-specific data. See GlobalPlatform CardSpecification v2.3 Section 11.11 for details.""" response_permitted = opts.response == 'may_be_returned' - self.store_data(h2b(opts.DATA), opts.data_structure, opts.encryption, response_permitted) - - def store_data(self, data: bytes, structure:str = 'none', encryption:str = 'none', response_permitted: bool = False) -> bytes: - """Perform the GlobalPlatform STORE DATA command in order to store some card-specific data. - See GlobalPlatform CardSpecification v2.3 Section 11.11 for details.""" - max_cmd_len = self._cmd.lchan.scc.max_cmd_len - # Table 11-89 of GP Card Specification v2.3 - remainder = data - block_nr = 0 - response = '' - while len(remainder): - chunk = remainder[:max_cmd_len] - remainder = remainder[max_cmd_len:] - p1b = build_construct(ADF_SD.StoreData, - {'last_block': len(remainder) == 0, 'encryption': encryption, - 'structure': structure, 'response': response_permitted}) - hdr = "80E2%02x%02x%02x" % (p1b[0], block_nr, len(chunk)) - data, _sw = self._cmd.lchan.scc.send_apdu_checksw(hdr + b2h(chunk) + "00") - block_nr += 1 - response += data - return h2b(response) + store_data(self._cmd.lchan, h2b(opts.DATA), opts.data_structure, opts.encryption, response_permitted) put_key_parser = argparse.ArgumentParser() put_key_parser.add_argument('--old-key-version-nr', type=auto_uint8, default=0, help='Old Key Version Number') @@ -635,20 +620,8 @@ p2 = opts.key_id if len(opts.key_type) > 1: p2 |= 0x80 - self.put_key(opts.old_key_version_nr, opts.key_version_nr, p2, kdb) + put_key(self._cmd.lchan, opts.old_key_version_nr, opts.key_version_nr, p2, kdb) - # Table 11-68: Key Data Field - Format 1 (Basic Format) - KeyDataBasic = GreedyRange(Struct('key_type'/KeyType, - 'kcb'/Prefixed(Int8ub, GreedyBytes), - 'kcv'/Prefixed(Int8ub, GreedyBytes))) - - def put_key(self, old_kvn:int, kvn: int, kid: int, key_dict: dict) -> bytes: - """Perform the GlobalPlatform PUT KEY command in order to store a new key on the card. - See GlobalPlatform CardSpecification v2.3 Section 11.8 for details.""" - key_data = kvn.to_bytes(1, 'big') + build_construct(ADF_SD.AddlShellCommands.KeyDataBasic, key_dict) - hdr = "80D8%02x%02x%02x" % (old_kvn, kid, len(key_data)) - data, _sw = self._cmd.lchan.scc.send_apdu_checksw(hdr + b2h(key_data) + "00") - return data get_status_parser = argparse.ArgumentParser() get_status_parser.add_argument('subset', choices=list(StatusSubset.ksymapping.values()), @@ -660,31 +633,10 @@ def do_get_status(self, opts): """Perform GlobalPlatform GET STATUS command in order to retrieve status information on Issuer Security Domain, Executable Load File, Executable Module or Applications.""" - grd_list = self.get_status(opts.subset, opts.aid) + grd_list = get_status(self._cmd.lchan, opts.subset, opts.aid) for grd in grd_list: self._cmd.poutput_json(grd.to_dict()) - def get_status(self, subset:str, aid_search_qualifier:Hexstr = '') -> List[GpRegistryRelatedData]: - subset_hex = b2h(build_construct(StatusSubset, subset)) - aid = ApplicationAID(decoded=aid_search_qualifier) - cmd_data = aid.to_tlv() + h2b('5c054f9f70c5cc') - p2 = 0x02 # TLV format according to Table 11-36 - grd_list = [] - while True: - hdr = "80F2%s%02x%02x" % (subset_hex, p2, len(cmd_data)) - data, sw = self._cmd.lchan.scc.send_apdu(hdr + b2h(cmd_data) + "00") - remainder = h2b(data) - while len(remainder): - # tlv sequence, each element is one GpRegistryRelatedData() - grd = GpRegistryRelatedData() - _dec, remainder = grd.from_tlv(remainder) - grd_list.append(grd) - if sw != '6310': - return grd_list - else: - p2 |= 0x01 - return grd_list - set_status_parser = argparse.ArgumentParser() set_status_parser.add_argument('scope', choices=list(SetStatusScope.ksymapping.values()), help='Defines the scope of the requested status change') @@ -698,14 +650,7 @@ """Perform GlobalPlatform SET STATUS command in order to change the life cycle state of the Issuer Security Domain, Supplementary Security Domain or Application. This normally requires prior authentication with a Secure Channel Protocol.""" - self.set_status(opts.scope, opts.status, opts.aid) - - def set_status(self, scope:str, status:str, aid:Hexstr = ''): - SetStatus = Struct(Const(0x80, Byte), Const(0xF0, Byte), - 'scope'/SetStatusScope, 'status'/CLifeCycleState, - 'aid'/Prefixed(Int8ub, COptional(GreedyBytes))) - apdu = build_construct(SetStatus, {'scope':scope, 'status':status, 'aid':aid}) - _data, _sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(apdu)) + set_status(self._cmd.lchan, opts.scope, opts.status, opts.aid) inst_perso_parser = argparse.ArgumentParser() inst_perso_parser.add_argument('application_aid', type=is_hexstr, help='Application AID') @@ -715,7 +660,8 @@ """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%02x%s000000" % (len(opts.application_aid)//2, opts.application_aid)) + install(self._cmd.lchan, 0x20, 0x00, "0000%02x%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='', @@ -750,7 +696,7 @@ # 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)) + install(self._cmd.lchan, p1, 0x00, b2h(ifi_bytes)) inst_load_parser = argparse.ArgumentParser() inst_load_parser.add_argument('--load-file-aid', type=is_hexstr, required=True, @@ -775,11 +721,7 @@ 'load_parameters'/Prefixed(Int8ub, GreedyBytes), 'load_token'/Prefixed(Int8ub, GreedyBytes)) ifl_bytes = build_construct(InstallForLoadCD, vars(opts)) - self.install(0x02, 0x00, b2h(ifl_bytes)) - - def install(self, p1:int, p2:int, data:Hexstr) -> ResTuple: - cmd_hex = "80E6%02x%02x%02x%s00" % (p1, p2, len(data)//2, data) - return self._cmd.lchan.scc.send_apdu_checksw(cmd_hex) + install(self._cmd.lchan, 0x02, 0x00, b2h(ifl_bytes)) del_cc_parser = argparse.ArgumentParser() del_cc_parser.add_argument('aid', type=is_hexstr, @@ -793,7 +735,7 @@ File, an Application or an Executable Load File and its related Applications.""" p2 = 0x80 if opts.delete_related_objects else 0x00 aid = ApplicationAID(decoded=opts.aid) - self.delete(0x00, p2, b2h(aid.to_tlv())) + delete(self._cmd.lchan, 0x00, p2, b2h(aid.to_tlv())) del_key_parser = argparse.ArgumentParser() del_key_parser.add_argument('--key-id', type=auto_uint7, help='Key Identifier (KID)') @@ -814,11 +756,7 @@ cmd += "d001%02x" % opts.key_id if opts.key_ver is not None: cmd += "d201%02x" % opts.key_ver - self.delete(0x00, p2, cmd) - - def delete(self, p1:int, p2:int, data:Hexstr) -> ResTuple: - cmd_hex = "80E4%02x%02x%02x%s00" % (p1, p2, len(data)//2, data) - return self._cmd.lchan.scc.send_apdu_checksw(cmd_hex) + delete(self._cmd.lchan, 0x00, p2, cmd) load_parser = argparse.ArgumentParser() load_parser_from_grp = load_parser.add_mutually_exclusive_group(required=True) @@ -831,33 +769,15 @@ """Perform a GlobalPlatform LOAD command. (We currently only support loading without DAP and without ciphering.)""" if opts.from_hex is not None: - self.load(h2b(opts.from_hex)) + load(self._cmd.lchan, h2b(opts.from_hex)) elif opts.from_file is not None: - self.load(opts.from_file.read()) + load(self._cmd.lchan, opts.from_file.read()) elif opts.from_cap_file is not None: cap = CapFile(opts.from_cap_file) - self.load(cap.get_loadfile()) + load(self._cmd.lchan, cap.get_loadfile()) else: raise ValueError('load source not specified!') - def load(self, contents:bytes, chunk_len:int = 240): - # TODO:tune chunk_len based on the overhead of the used SCP? - # build TLV according to GPC_SPE_034 section 11.6.2.3 / Table 11-58 for unencrypted case - remainder = b'\xC4' + bertlv_encode_len(len(contents)) + contents - # transfer this in various chunks to the card - total_size = len(remainder) - block_nr = 0 - while len(remainder): - block = remainder[:chunk_len] - remainder = remainder[chunk_len:] - # build LOAD command APDU according to GPC_SPE_034 section 11.6.2 / Table 11-56 - p1 = 0x00 if len(remainder) else 0x80 - p2 = block_nr % 256 - block_nr += 1 - cmd_hex = "80E8%02x%02x%02x%s00" % (p1, p2, len(block), b2h(block)) - _rsp_hex, _sw = self._cmd.lchan.scc.send_apdu_checksw(cmd_hex) - self._cmd.poutput("Loaded a total of %u bytes in %u blocks. Don't forget install_for_install (and make selectable) now!" % (total_size, block_nr)) - install_cap_parser = argparse.ArgumentParser(usage='%(prog)s FILE [--install-parameters | --install-parameters-*]') install_cap_parser.add_argument('cap_file', type=str, metavar='FILE', help='JAVA-CARD CAP file to install') @@ -918,7 +838,7 @@ self._cmd.poutput("step #1: install for load...") self.do_install_for_load("--load-file-aid %s --security-domain-aid %s" % (load_file_aid, security_domain_aid)) self._cmd.poutput("step #2: load...") - self.load(load_file) + load(self._cmd.lchan, load_file) self._cmd.poutput("step #3: install_for_install (and make selectable)...") self.do_install_for_install("--load-file-aid %s --module-aid %s --application-aid %s --install-parameters %s --make-selectable" % (load_file_aid, module_aid, application_aid, install_parameters)) @@ -958,7 +878,7 @@ host_challenge = h2b(opts.host_challenge) if opts.host_challenge else get_random_bytes(8) kset = GpCardKeyset(opts.key_ver, h2b(opts.key_enc), h2b(opts.key_mac), h2b(opts.key_dek)) scp02 = SCP02(card_keys=kset) - self._establish_scp(scp02, host_challenge, opts.security_level) + establish_scp(self._cmd.lchan, scp02, host_challenge, opts.security_level) est_scp03_parser = deepcopy(est_scp02_parser) est_scp03_parser.description = None @@ -986,27 +906,14 @@ host_challenge = h2b(opts.host_challenge) if opts.host_challenge else get_random_bytes(s_mode) kset = GpCardKeyset(opts.key_ver, h2b(opts.key_enc), h2b(opts.key_mac), h2b(opts.key_dek)) scp03 = SCP03(card_keys=kset, s_mode = s_mode) - self._establish_scp(scp03, host_challenge, opts.security_level) - - def _establish_scp(self, scp, host_challenge, security_level): - # perform the common functionality shared by SCP02 and SCP03 establishment - init_update_apdu = scp.gen_init_update_apdu(host_challenge=host_challenge) - init_update_resp, _sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(init_update_apdu)) - scp.parse_init_update_resp(h2b(init_update_resp)) - ext_auth_apdu = scp.gen_ext_auth_apdu(security_level) - _ext_auth_resp, _sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(ext_auth_apdu)) - self._cmd.poutput("Successfully established a %s secure channel" % str(scp)) - # store a reference to the SCP instance - self._cmd.lchan.scc.scp = scp - self._cmd.update_prompt() - + establish_scp(self._cmd.lchan, scp03, host_challenge, opts.security_level) def do_release_scp(self, _opts): """Release a previously establiehed secure channel.""" if not self._cmd.lchan.scc.scp: self._cmd.poutput("Cannot release SCP as none is established") return - self._cmd.lchan.scc.scp = None + release_scp(self._cmd.lchan) self._cmd.update_prompt() # Card Application of a Security Domain @@ -1075,3 +982,120 @@ return None else: return kcv_calculator(key)[:3] + +def store_data(lchan: RuntimeLchan, data: bytes, structure:str = 'none', encryption:str = 'none', + response_permitted: bool = False) -> bytes: + """ + Perform the GlobalPlatform STORE DATA command in order to store some card-specific data. + See GlobalPlatform CardSpecification v2.3 Section 11.11 for details. + """ + max_cmd_len = lchan.scc.max_cmd_len + # Table 11-89 of GP Card Specification v2.3 + remainder = data + block_nr = 0 + response = '' + while len(remainder): + chunk = remainder[:max_cmd_len] + remainder = remainder[max_cmd_len:] + p1b = build_construct(ADF_SD.StoreData, + {'last_block': len(remainder) == 0, 'encryption': encryption, + 'structure': structure, 'response': response_permitted}) + hdr = "80E2%02x%02x%02x" % (p1b[0], block_nr, len(chunk)) + data, _sw = lchan.scc.send_apdu_checksw(hdr + b2h(chunk) + "00") + block_nr += 1 + response += data + return h2b(response) + + + +def get_data(lchan: RuntimeLchan, tag: int) -> bytes: + (data, _sw) = lchan.scc.get_data(cla=0x80, tag=tag) + return data + +def put_key(lchan: RuntimeLchan, old_kvn:int, kvn: int, kid: int, key_dict: dict) -> bytes: + """ + Perform the GlobalPlatform PUT KEY command in order to store a new key on the card. + See GlobalPlatform CardSpecification v2.3 Section 11.8 for details. + """ + + # Table 11-68: Key Data Field - Format 1 (Basic Format) + KeyDataBasic = GreedyRange(Struct('key_type'/KeyType, + 'kcb'/Prefixed(Int8ub, GreedyBytes), + 'kcv'/Prefixed(Int8ub, GreedyBytes))) + + key_data = kvn.to_bytes(1, 'big') + build_construct(KeyDataBasic, key_dict) + hdr = "80D8%02x%02x%02x" % (old_kvn, kid, len(key_data)) + data, _sw = lchan.scc.send_apdu_checksw(hdr + b2h(key_data) + "00") + return data + +def get_status(lchan: RuntimeLchan, subset:str, aid_search_qualifier:Hexstr = '') -> List[GpRegistryRelatedData]: + subset_hex = b2h(build_construct(StatusSubset, subset)) + aid = ApplicationAID(decoded=aid_search_qualifier) + cmd_data = aid.to_tlv() + h2b('5c054f9f70c5cc') + p2 = 0x02 # TLV format according to Table 11-36 + grd_list = [] + while True: + hdr = "80F2%s%02x%02x" % (subset_hex, p2, len(cmd_data)) + data, sw = lchan.scc.send_apdu(hdr + b2h(cmd_data) + "00") + remainder = h2b(data) + while len(remainder): + # tlv sequence, each element is one GpRegistryRelatedData() + grd = GpRegistryRelatedData() + _dec, remainder = grd.from_tlv(remainder) + grd_list.append(grd) + if sw != '6310': + return grd_list + else: + p2 |= 0x01 + return grd_list + +def set_status(lchan: RuntimeLchan, scope:str, status:str, aid:Hexstr = ''): + SetStatus = Struct(Const(0x80, Byte), Const(0xF0, Byte), + 'scope'/SetStatusScope, 'status'/CLifeCycleState, + 'aid'/Prefixed(Int8ub, COptional(GreedyBytes))) + apdu = build_construct(SetStatus, {'scope':scope, 'status':status, 'aid':aid}) + _data, _sw = lchan.scc.send_apdu_checksw(b2h(apdu)) + + inst_perso_parser = argparse.ArgumentParser() + inst_perso_parser.add_argument('application_aid', type=is_hexstr, help='Application AID') + +def install(lchan: RuntimeLchan, p1:int, p2:int, data:Hexstr) -> ResTuple: + cmd_hex = "80E6%02x%02x%02x%s00" % (p1, p2, len(data)//2, data) + return lchan.scc.send_apdu_checksw(cmd_hex) + +def delete(lchan: RuntimeLchan, p1:int, p2:int, data:Hexstr) -> ResTuple: + cmd_hex = "80E4%02x%02x%02x%s00" % (p1, p2, len(data)//2, data) + return lchan.scc.send_apdu_checksw(cmd_hex) + +def load(lchan: RuntimeLchan, contents:bytes, chunk_len:int = 240): + # TODO:tune chunk_len based on the overhead of the used SCP? + # build TLV according to GPC_SPE_034 section 11.6.2.3 / Table 11-58 for unencrypted case + remainder = b'\xC4' + bertlv_encode_len(len(contents)) + contents + # transfer this in various chunks to the card + total_size = len(remainder) + block_nr = 0 + while len(remainder): + block = remainder[:chunk_len] + remainder = remainder[chunk_len:] + # build LOAD command APDU according to GPC_SPE_034 section 11.6.2 / Table 11-56 + p1 = 0x00 if len(remainder) else 0x80 + p2 = block_nr % 256 + block_nr += 1 + cmd_hex = "80E8%02x%02x%02x%s00" % (p1, p2, len(block), b2h(block)) + _rsp_hex, _sw = lchan.scc.send_apdu_checksw(cmd_hex) + log.info("Loaded a total of %u bytes in %u blocks. Don't forget install_for_install (and make selectable) now!", + total_size, block_nr) + +def establish_scp(lchan: RuntimeLchan, scp, host_challenge, security_level): + # perform the common functionality shared by SCP02 and SCP03 establishment + init_update_apdu = scp.gen_init_update_apdu(host_challenge=host_challenge) + init_update_resp, _sw = lchan.scc.send_apdu_checksw(b2h(init_update_apdu)) + scp.parse_init_update_resp(h2b(init_update_resp)) + ext_auth_apdu = scp.gen_ext_auth_apdu(security_level) + _ext_auth_resp, _sw = lchan.scc.send_apdu_checksw(b2h(ext_auth_apdu)) + log.info("Successfully established a %s secure channel", str(scp)) + # store a reference to the SCP instance + lchan.scc.scp = scp + +def release_scp(lchan: RuntimeLchan): + lchan.scc.scp = None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Idf4e4b58bf49ba62b2c22de4c49a2dcacfa872cb Gerrit-Change-Number: 42741 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in pysim[master]: cosmetic: remove excess linebreaks
by dexter 07 May '26

07 May '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42733?usp=email ) Change subject: cosmetic: remove excess linebreaks ...................................................................... cosmetic: remove excess linebreaks We should not use double-line breaks to separate things as it is very difficult to maintain consistence with that scheme. Change-Id: I2272abcdbba0e57c5118b69bc9398cd909a469b5 --- M pySim-shell.py M pySim/card_key_provider.py M pySim/global_platform/__init__.py M pySim/transport/__init__.py 4 files changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/33/42733/1 diff --git a/pySim-shell.py b/pySim-shell.py index 29ed3a5..bd7d0c0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1121,15 +1121,12 @@ fcp_dec = self._cmd.lchan.status() self._cmd.poutput_json(fcp_dec) - class Proact(ProactiveHandler): def receive_fetch(self, pcmd: ProactiveCommand): # print its parsed representation print(pcmd.decoded) # TODO: implement the basics, such as SMS Sending, ... - - option_parser = argparse.ArgumentParser(description='interactive SIM card shell', formatter_class=argparse.ArgumentDefaultsHelpFormatter) argparse_add_reader_args(option_parser) diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index 06a6b2b..2403694 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -264,7 +264,6 @@ raise ValueError("provider is not a card data provider") provider_list.append(provider) - def card_key_provider_get(fields: list[str], key: str, value: str, provider_list=card_key_providers) -> Dict[str, str]: """Query all registered card data providers for card-individual [key] data. @@ -289,7 +288,6 @@ raise ValueError("Unable to find card key data (key=%s, value=%s, fields=%s)" % (key, value, str(fields))) - def card_key_provider_get_field(field: str, key: str, value: str, provider_list=card_key_providers) -> str: """Query all registered card data providers for a single field. diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 6ff4b28..306746f 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -460,7 +460,6 @@ # 11.4.2.1 StatusSubset = Enum(Byte, isd=0x80, applications=0x40, files=0x20, files_and_modules=0x10) - # Section 11.4.3.1 Table 11-36 class LifeCycleState(BER_TLV_IE, tag=0x9f70): _construct = CLifeCycleState @@ -1010,7 +1009,6 @@ self._cmd.lchan.scc.scp = None self._cmd.update_prompt() - # Card Application of a Security Domain class CardApplicationSD(CardApplication): __intermediate = True @@ -1048,7 +1046,6 @@ return "%s(KVN=%u, ENC=%s, MAC=%s, DEK=%s)" % (self.__class__.__name__, self.kvn, b2h(self.enc), b2h(self.mac), b2h(self.dek)) - def compute_kcv_des(key:bytes) -> bytes: # GP Card Spec B.6: For a DES key, the key check value is computed by encrypting 8 bytes, each with # value '00', with the key to be checked and retaining the 3 highest-order bytes of the encrypted diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index d689a0a..d3cf8d0 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -25,7 +25,6 @@ from typing import Optional, Tuple from construct import Construct from osmocom.utils import b2h, h2b, i2h, Hexstr - from pySim.exceptions import * from pySim.utils import SwHexstr, SwMatchstr, ResTuple, sw_match, parse_command_apdu from pySim.cat import ProactiveCommand, CommandDetails, DeviceIdentities, Result @@ -244,7 +243,6 @@ raise SwMatchError(rv[1], sw.lower(), self.sw_interpreter) return rv - class LinkBaseTpdu(LinkBase): # Use the T=0 TPDU format by default as this is the most commonly used transport protocol. @@ -373,7 +371,6 @@ return arg_parser - def init_reader(opts, **kwargs) -> LinkBase: """ Init card reader driver -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2272abcdbba0e57c5118b69bc9398cd909a469b5 Gerrit-Change-Number: 42733 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log May 2026