Improve brutefid

git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@185 f711b948-2313-0410-aaa9-d29f33439f0b

brutefid.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: iso-8859-1 -*-
 
-import pycsc, utils, cards, TLV_utils, sys, binascii, time, getopt
+import pycsc, utils, cards, TLV_utils, sys, binascii, time, getopt, traceback
 
 STATUS_INTERVAL = 10
 
@@ -89,7 +89,6 @@ if __name__ == "__main__":
         top_level = ("".join( ["".join(e.split()) for e in arguments] )).split("/")
         top_level = [binascii.unhexlify(e) for e in top_level]
     
-
     pycsc_card = connect(reader)
     card = cards.new_card_object(pycsc_card)
     cards.generic_card.DEBUG = False
@@ -103,6 +102,7 @@ if __name__ == "__main__":
     #objective = (0x2f00, 0x5015) ## Test cases on an OpenSC formatted PKCS#15 card
     objective = range(0xffff+1) 
     #objective = range(0x3fff+1) + range(0x7000,0x7fff+1) + range(0xc000,0xd4ff+1) + range(0xd600+1,0xd7ff+1) + range(0xdc00+1,0xffff+1)
+    try:
         for fid in objective:
             data = chr(fid >> 8) + chr(fid & 0xff)
             if loop % STATUS_INTERVAL == 0:
@@ -115,6 +115,7 @@ if __name__ == "__main__":
                     status = status + ")"
             loop = loop + 1
             
+            if True:
                 result = card.change_dir(data)
                 if card.check_sw(result.sw):
                     results_dir[fid] = result
@@ -129,6 +130,10 @@ if __name__ == "__main__":
                 results_file[fid] = result
             
             print >>sys.stderr, "\rFile %04X -> %02X%02X %s" % (fid, result.sw1, result.sw2, status),
+    except (SystemExit, KeyboardInterrupt):
+        raise
+    except:
+        traceback.print_exc()
 
 
     print >>sys.stderr