Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compati...

[proxmark3-svn] / tools / findbits.py

diff --git a/tools/findbits.py b/tools/findbits.py
index 84f4670f6cdb858197557852bace5a46b3718841..1860964b11a144490489c87284d57d3dda1e4f92 100755 (executable)
--- a/tools/findbits.py
+++ b/tools/findbits.py
@@ -22,7 +22,6 @@
 
 import sys
 import os
 
 import sys
 import os

-import string

 
 # invert binary string
 def invert(data):
 
 # invert binary string
 def invert(data):


@@ -30,7 +29,7 @@ def invert(data):
 
 # do the actual search
 def search(target,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):])
        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
        return data[::-1]
 
 # match forward, backward and inverted

-def domatch(number,binary):
+def domatch(binary,number):

        reversed= stringreverse(number)
        inverted= invert(binary)
 
        reversed= stringreverse(number)
        inverted= invert(binary)
 


@@ -85,11 +84,11 @@ def main():
                16:'HEX',
                        }
 
                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
                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])
                        # do BINARY as specified to preserve leading zeros
                        if base == 2:
                                domatch(sys.argv[1],sys.argv[2])