catarrh/pysim-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cards.py: SJS1 + SJA2: Implement + Expose verify_adm() method

Browse Source 
SJS1 and SJA2 card types don't use the generic verify_adm()
method of the Card base class, so they must override it with their
own methods.  Only this way application code can call card.verify_adm()
irrespective of the card type.

Change-Id: I05f7f3280873f006310266867f04a9ce1b0a63af
This commit is contained in:
Harald Welte
2021-01-08 20:19:11 +01:00
parent 6d5e0c9272
commit a670425088
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pySim/cards.py
View File

@@ -849,12 +849,17 @@ class SysmoUSIMSJS1(UsimCard):
return None
return None
def program(self, p):
def verify_adm(self, key):
# authenticate as ADM using default key (written on the card..)
if not p['pin_adm']:
if not key:
raise ValueError("Please provide a PIN-ADM as there is no default one")
self._scc.verify_chv(0x0A, h2b(p['pin_adm']))
(res, sw) = self._scc.verify_chv(0x0A, key)
if sw != '9000':
raise RuntimeError('Failed to authenticate with ADM key %s'%(key))
return sw
def program(self, p):
self.verify_adm(h2b(p['pin_adm']))
# select MF
r = self._scc.select_file(['3f00'])
@@ -1244,11 +1249,17 @@ class SysmoISIMSJA2(UsimCard, IsimCard):
return None
return None
def program(self, p):
def verify_adm(self, key):
# authenticate as ADM using default key (written on the card..)
if not p['pin_adm']:
if not key:
raise ValueError("Please provide a PIN-ADM as there is no default one")
self._scc.verify_chv(0x0A, h2b(p['pin_adm']))
(res, sw) = self._scc.verify_chv(0x0A, key)
if sw != '9000':
raise RuntimeError('Failed to authenticate with ADM key %s'%(key))
return sw
def program(self, p):
self.verify_adm(h2b(p['pin_adm']))
# This type of card does not allow to reprogram the ICCID.
# Reprogramming the ICCID would mess up the card os software