pySim-prog: Print out hex-escaped pin_adm in card parameters
Use h2b to convert pin_adm back to binary form for sysmoSIMgr2
Change-Id: Ia178c9938f3e6a4fbac24d767437894297d1e708
diff --git a/pySim-prog.py b/pySim-prog.py
index 2638eef..7edadd7 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -406,14 +406,15 @@
def print_parameters(params):
print """Generated card parameters :
- > Name : %(name)s
- > SMSP : %(smsp)s
- > ICCID : %(iccid)s
- > MCC/MNC : %(mcc)d/%(mnc)d
- > IMSI : %(imsi)s
- > Ki : %(ki)s
- > OPC : %(opc)s
- > ACC : %(acc)s
+ > Name : %(name)s
+ > SMSP : %(smsp)s
+ > ICCID : %(iccid)s
+ > MCC/MNC : %(mcc)d/%(mnc)d
+ > IMSI : %(imsi)s
+ > Ki : %(ki)s
+ > OPC : %(opc)s
+ > ACC : %(acc)s
+ > ADM1(hex): %(pin_adm)s
""" % params
diff --git a/pySim/cards.py b/pySim/cards.py
index 55282aa..cda337a 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -496,7 +496,7 @@
# 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']
+ pin = h2b(p['pin_adm'])
else:
pin = h2b("4444444444444444")