Some bugfixes. I think

henryk · Apr 6, 2011 · ffc5ac2 · ffc5ac2
1 parent 14819e9
commit ffc5ac2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/brutefid.py b/brutefid.py
@@ -122,7 +122,7 @@ def dump(data):
                 if dump_contents:
                     contents, sw = card.read_binary_file()
                     contents_result = [sw]
-                    if sw == '\x69\x81': # Command incompatible with file structure, retry read_record
+                    if sw == '\x69\x81' or sw == '\x69\xf0': # Command incompatible with file structure, retry read_record
                         # FIXME this logic for reading records is not correct
                         print >>sys.stderr, "\rFile %04X -> %02X%02X %s  Reading records...  " % (fid, result.sw1, result.sw2, status),
                         records = {}

diff --git a/cards/tcos_card.py b/cards/tcos_card.py
@@ -725,7 +725,7 @@ def decode_access_rule(mask, value):
 )
 
 def decode_compact_access_bitmap(value):
-    return (" %s \n" % utils.hexdump(value, short=True)) + "\n\t".join(utils.parse_binary(ord(value[0]), compact_access_descriptions, True))
+    return (" %s \n" % utils.hexdump(value, short=True)) + "\n".join(utils.parse_binary(ord(value[0]), compact_access_descriptions, True))
 
 class TCOS_3_Card(TCOS_Card):
     DRIVER_NAME = ["TCOS 3.0"]