X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9f975d42e8a1deca182270642c365ba11f565259..c656c870ae9a4ab52874f945748065227cdb1ad7:/tools/findbits.py?ds=inline diff --git a/tools/findbits.py b/tools/findbits.py index 6562f776..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):]) @@ -39,21 +38,14 @@ def search(target,data): # convert integer to binary string def binstring(number): - out= '' - while number > 0: - out += chr(0x30 + (number & 0x01)) - number= number >> 1 - return stringreverse(out) + return bin(number)[2:] if number > 0 else '' # reverse string order def stringreverse(data): - out= '' - for x in range(len(data) -1,-1,-1): - out += data[x] - return out + return data[::-1] # match forward, backward and inverted -def domatch(number,binary): +def domatch(binary,number): reversed= stringreverse(number) inverted= invert(binary) @@ -92,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])