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

pySim-shell: Support other ADMx values beyond ADM1 from 'verify_adm'

Browse Source 
Change-Id: Icce6903c1e449889f8bc5003ccfe6af767a26d44
This commit is contained in:
Harald Welte
2024-08-01 11:37:45 +02:00
parent fdae0ff90d
commit 08d7c10211
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pySim-shell.py
View File

@@ -55,6 +55,7 @@ from pySim.utils import is_hexstr_or_decimal, is_hexstr, is_decimal
from pySim.card_handler import CardHandler, CardHandlerAuto from pySim.card_handler import CardHandler, CardHandlerAuto
from pySim.filesystem import CardMF, CardDF, CardADF from pySim.filesystem import CardMF, CardDF, CardADF
from pySim.ts_102_221 import pin_names
from pySim.ts_102_222 import Ts102222Commands from pySim.ts_102_222 import Ts102222Commands
from pySim.gsm_r import DF_EIRENE from pySim.gsm_r import DF_EIRENE
from pySim.cat import ProactiveCommand from pySim.cat import ProactiveCommand
@@ -824,37 +825,46 @@ class PySimCommands(CommandSet):
self._cmd.poutput("no description available") self._cmd.poutput("no description available")
verify_adm_parser = argparse.ArgumentParser() verify_adm_parser = argparse.ArgumentParser()
verify_adm_parser.add_argument('ADM1', nargs='?', type=is_hexstr_or_decimal, verify_adm_parser.add_argument('ADM', nargs='?', type=is_hexstr_or_decimal,
help='ADM1 pin value. If none given, CSV file will be queried') help='ADM pin value. If none given, CSV file will be queried')
verify_adm_parser.add_argument('--pin-is-hex', action='store_true', verify_adm_parser.add_argument('--pin-is-hex', action='store_true',
help='ADM1 pin value is specified as hex-string (not decimal)') help='ADM pin value is specified as hex-string (not decimal)')
verify_adm_parser.add_argument('--adm-type',
choices=[x for x in pin_names.values() if x.startswith('ADM')],
help='Override ADM number. Default is card-model-specific, usually 1')
@cmd2.with_argparser(verify_adm_parser) @cmd2.with_argparser(verify_adm_parser)
def do_verify_adm(self, opts): def do_verify_adm(self, opts):
"""Verify the ADM (Administrator) PIN specified as argument. This is typically needed in order """Verify the ADM (Administrator) PIN specified as argument. This is typically needed in order
to get write/update permissions to most of the files on SIM cards. Currently only ADM1 is supported. to get write/update permissions to most of the files on SIM cards.
""" """
if opts.ADM1: if opts.adm_type:
# pylint: disable=unsubscriptable-object
adm_chv_num = pin_names.inverse[opts.adm_type]
else:
adm_chv_num = self._cmd.card._adm_chv_num
if opts.ADM:
# use specified ADM-PIN # use specified ADM-PIN
if opts.pin_is_hex: if opts.pin_is_hex:
pin_adm = sanitize_pin_adm(None, opts.ADM1) pin_adm = sanitize_pin_adm(None, opts.ADM)
else: else:
pin_adm = sanitize_pin_adm(opts.ADM1) pin_adm = sanitize_pin_adm(opts.ADM)
else: else:
iccid = self._cmd.rs.identity['ICCID'] iccid = self._cmd.rs.identity['ICCID']
adm_type = opts.adm_type or 'ADM1'
# try to find an ADM-PIN if none is specified # try to find an ADM-PIN if none is specified
result = card_key_provider_get_field('ADM1', key='ICCID', value=iccid) result = card_key_provider_get_field(adm_type, key='ICCID', value=iccid)
if opts.pin_is_hex: if opts.pin_is_hex:
pin_adm = sanitize_pin_adm(None, result) pin_adm = sanitize_pin_adm(None, result)
else: else:
pin_adm = sanitize_pin_adm(result) pin_adm = sanitize_pin_adm(result)
if pin_adm: if pin_adm:
self._cmd.poutput("found ADM-PIN '%s' for ICCID '%s'" % (result, iccid)) self._cmd.poutput("found %s '%s' for ICCID '%s'" % (adm_type, result, iccid))
else: else:
raise ValueError("cannot find ADM-PIN for ICCID '%s'" % (iccid)) raise ValueError("cannot find %s for ICCID '%s'" % (adm_type, iccid))
if pin_adm: if pin_adm:
self._cmd.lchan.scc.verify_chv(self._cmd.card._adm_chv_num, h2b(pin_adm)) self._cmd.lchan.scc.verify_chv(adm_chv_num, h2b(pin_adm))
else: else:
raise ValueError("error: cannot authenticate, no adm-pin!") raise ValueError("error: cannot authenticate, no adm-pin!")