diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2021-03-11 13:59:44 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2021-03-23 11:54:47 +0000 |
| commit | 05f42ee929e1107ca0e57d6bb355e0d5cc7e93cb (patch) | |
| tree | 8fcaadf096d86bbc3cee2ba1535d05d24ca4e633 | |
| parent | a31e9a9a68bca3f9b70fc046aec6751cbb0d9335 (diff) | |
cards: remove unnecessary execptions.
The _scc.veryif_adm() method already does status word checking
internally and also raises an execption should the authentication be
unsuccessful, so we do not have to put an additional status word check +
execition when we use the method from cards.
Change-Id: I785d27e4d49a9cda1a771b56ce5ac9c1f1d1e79a
Related: OS#4963
| -rw-r--r-- | pySim/cards.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pySim/cards.py b/pySim/cards.py index 8b51787..c640591 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -854,8 +854,6 @@ class SysmoUSIMSJS1(UsimCard): if not key: raise ValueError("Please provide a PIN-ADM as there is no default one") (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): @@ -1045,9 +1043,7 @@ class FairwavesSIM(UsimCard): # authenticate as ADM1 if not p['pin_adm']: raise ValueError("Please provide a PIN-ADM as there is no default one") - sw = self.verify_adm(h2b(p['pin_adm'])) - if sw != '9000': - raise RuntimeError('Failed to authenticate with ADM key %s'%(p['pin_adm'],)) + self.verify_adm(h2b(p['pin_adm'])) # TODO: Set operator name if p.get('smsp') is not None: @@ -1152,9 +1148,7 @@ class WavemobileSim(UsimCard): def program(self, p): if not p['pin_adm']: raise ValueError("Please provide a PIN-ADM as there is no default one") - sw = self.verify_adm(h2b(p['pin_adm'])) - if sw != '9000': - raise RuntimeError('Failed to authenticate with ADM key %s'%(p['pin_adm'],)) + self.verify_adm(h2b(p['pin_adm'])) # EF.ICCID # TODO: Add programming of the ICCID @@ -1254,8 +1248,6 @@ class SysmoISIMSJA2(UsimCard, IsimCard): if not key: raise ValueError("Please provide a PIN-ADM as there is no default one") (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): |