X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ee0ef5c5d7eaa3ac164c407e84aec84842c79e88..3962dce565fc63c0190d4570bfaf339ec32b7025:/tools/findbits.py

diff --git a/tools/findbits.py b/tools/findbits.py
index 84f4670f..1860964b 100755
--- a/tools/findbits.py
+++ b/tools/findbits.py
@@ -22,7 +22,6 @@
 
 import sys
 import os
-import string
 
 # invert binary string
 def invert(data):
@@ -30,7 +29,7 @@ def invert(data):
 
 # do the actual search
 def search(target,data):
-	location= string.find(data,target)
+	location = data.find(target)
 	if location >= 0:
 		print '*** Match at bit %d:' % location,
 		print '%s<%s>%s' % (data[:location],target,data[location+len(target):])
@@ -46,7 +45,7 @@ def stringreverse(data):
 	return data[::-1]
 
 # match forward, backward and inverted
-def domatch(number,binary):
+def domatch(binary,number):
 	reversed= stringreverse(number)
 	inverted= invert(binary)
 
@@ -85,11 +84,11 @@ def main():
 		16:'HEX',
 			}
 
-	for base in 2,8,10,16:
+	for base, base_name in sorted(bases.iteritems()):
 		try:
 			number= int(sys.argv[1],base)
 			print
-			print 'Trying', bases[base]
+			print 'Trying', base_name
 			# do BINARY as specified to preserve leading zeros
 			if base == 2:
 				domatch(sys.argv[1],sys.argv[2])