diff options
| author | Harald Welte <laforge@osmocom.org> | 2021-01-21 14:10:43 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2021-03-02 08:06:13 +0100 |
| commit | e79cc8069aa73aefe26e8862b126920c9532c1a2 (patch) | |
| tree | 2b2e5ae2f204a21dc4b5eb8f53d5f4d9046e26f0 | |
| parent | 79b5ba4bdfb65346dc4ac9b04db5aa39593bca9a (diff) | |
introduce SwMatchError exception
This allows callers further up the stack to catch the exception and
interpret it in some way (like decoding the number of remaining tries
in case of authentication errors)
Change-Id: Ia59962978745aef7038f750fa23f8dfc820645f4
| -rw-r--r-- | pySim/exceptions.py | 10 | ||||
| -rw-r--r-- | pySim/transport/__init__.py | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pySim/exceptions.py b/pySim/exceptions.py index c0cf1e7..5d30f76 100644 --- a/pySim/exceptions.py +++ b/pySim/exceptions.py @@ -5,6 +5,7 @@ # # Copyright (C) 2009-2010 Sylvain Munaut <tnt@246tNt.com> +# Copyright (C) 2021 Harald Welte <laforge@osmocom.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,3 +37,12 @@ class ProtocolError(Exception): class ReaderError(Exception): pass + +class SwMatchError(Exception): + """Raised when an operation specifies an expected SW but the actual SW from + the card doesn't match.""" + def __init__(self, sw_actual, sw_expected): + self.sw_actual = sw_actual + self.sw_expected = sw_expected + def __str__(self): + return "SW match failed! Expected %s and got %s." % (self.sw_expected, self.sw_actual) diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 8e009ee..00c7bd9 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -3,6 +3,8 @@ """ pySim: PCSC reader transport link base """ +from pySim.exceptions import * + # # Copyright (C) 2009-2010 Sylvain Munaut <tnt@246tNt.com> # @@ -100,5 +102,5 @@ class LinkBase(object): sw_masked = sw_masked + rv[1][i].lower() if sw.lower() != sw_masked: - raise RuntimeError("SW match failed! Expected %s and got %s." % (sw.lower(), rv[1])) + raise SwMatchError(rv[1], sw.lower()) return rv |