aboutsummaryrefslogtreecommitdiffstats
path: root/pySim/cards.py
diff options
context:
space:
mode:
authorDaniel Willmann <daniel@totalueberwachung.de>2018-06-15 07:31:50 +0200
committerHarald Welte <laforge@gnumonks.org>2019-08-28 23:21:56 +0200
commit1d00c19d147db2e77ed980292ae82ea5eff3a21a (patch)
treecb2ad2fffc5b3485afc8e885d07795b427157e49 /pySim/cards.py
parent23888dab85165f44bfd8ee649dbfc869e881545d (diff)
pySim-prog: Use CSV format with headers
This way we can have optional fields like adm1 in the file Also require iccid as identifier for the SIM card Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236
Diffstat (limited to 'pySim/cards.py')
-rw-r--r--pySim/cards.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/pySim/cards.py b/pySim/cards.py
index 55282aa..a850e5a 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -375,8 +375,8 @@ class GrcardSim(Card):
#self._scc.verify_chv(4, h2b("4444444444444444"))
# Authenticate using ADM PIN 5
- if p['pin_adm']:
- pin = h2b(p['pin_adm'])
+ if p['adm1']:
+ pin = h2b(p['adm1'])
else:
pin = h2b("4444444444444444")
self._scc.verify_chv(5, pin)
@@ -495,8 +495,8 @@ class SysmoSIMgr2(Card):
# P1: 3A for PIN, 3B for PUK
# P2: CHV number, as in VERIFY CHV for PIN, and as in UNBLOCK CHV for PUK
# P3: 08, CHV length (curiously the PUK is also 08 length, instead of 10)
- if p['pin_adm']:
- pin = p['pin_adm']
+ if p['adm1']:
+ pin = p['adm1']
else:
pin = h2b("4444444444444444")
@@ -567,9 +567,9 @@ class SysmoUSIMSJS1(Card):
def program(self, p):
# authenticate as ADM using default key (written on the card..)
- if not p['pin_adm']:
+ if not p['adm1']:
raise ValueError("Please provide a PIN-ADM as there is no default one")
- self._scc.verify_chv(0x0A, h2b(p['pin_adm']))
+ self._scc.verify_chv(0x0A, p['adm1'])
# select MF
r = self._scc.select_file(['3f00'])