fixeria has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/42379?usp=email )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ara_m: fix exceptions not being raised properly
......................................................................
ara_m: fix exceptions not being raised properly
Exceptions are meant to be thrown/raised, not returned.
Change-Id: Id799c264447e22887edcd2dc7eb991cf0af1bbfc
---
M pySim/ara_m.py
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
diff --git a/pySim/ara_m.py b/pySim/ara_m.py
index b338c43..aa41268 100644
--- a/pySim/ara_m.py
+++ b/pySim/ara_m.py
@@ -72,10 +72,10 @@
if do[0] == 0x01:
self.decoded = {'generic_access_rule': 'always'}
return self.decoded
- return ValueError('Invalid 1-byte generic APDU access rule')
+ raise ValueError('Invalid 1-byte generic APDU access rule')
else:
if len(do) % 8:
- return ValueError('Invalid non-modulo-8 length of APDU filter:
%d' % len(do))
+ raise ValueError('Invalid non-modulo-8 length of APDU filter:
%d' % len(do))
self.decoded = {'apdu_filter': []}
offset = 0
while offset < len(do):
@@ -90,19 +90,19 @@
return b'\x00'
if self.decoded['generic_access_rule'] == 'always':
return b'\x01'
- return ValueError('Invalid 1-byte generic APDU access rule')
+ raise ValueError('Invalid 1-byte generic APDU access rule')
else:
if not 'apdu_filter' in self.decoded:
- return ValueError('Invalid APDU AR DO')
+ raise ValueError('Invalid APDU AR DO')
filters = self.decoded['apdu_filter']
res = b''
for f in filters:
if not 'header' in f or not 'mask' in f:
- return ValueError('APDU filter must contain header and
mask')
+ raise ValueError('APDU filter must contain header and
mask')
header_b = h2b(f['header'])
mask_b = h2b(f['mask'])
if len(header_b) != 4 or len(mask_b) != 4:
- return ValueError('APDU filter header and mask must each
be 4 bytes')
+ raise ValueError('APDU filter header and mask must each be
4 bytes')
res += header_b + mask_b
return res
@@ -269,7 +269,7 @@
cmd_do_enc = cmd_do.to_ie()
cmd_do_len = len(cmd_do_enc)
if cmd_do_len > 255:
- return ValueError('DO > 255 bytes not supported yet')
+ raise ValueError('DO > 255 bytes not supported yet')
else:
cmd_do_enc = b''
cmd_do_len = 0
@@ -361,7 +361,7 @@
ar_do_content += [{'apdu_ar_do': {'generic_access_rule':
'always'}}]
elif opts.apdu_filter:
if len(opts.apdu_filter) % 16:
- return ValueError('Invalid non-modulo-16 length of APDU
filter: %d' % len(do))
+ raise ValueError('Invalid non-modulo-16 length of APDU
filter: %d' % len(do))
offset = 0
apdu_filter = []
while offset < len(opts.apdu_filter):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/42379?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id799c264447e22887edcd2dc7eb991cf0af1bbfc
Gerrit-Change-Number: 42379
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: dexter <[email protected]>
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
