Merge branch 'master' of github.com:aczid/crypto1_bs

This commit is contained in:
Aram
2019-05-09 01:17:43 +02:00
2 changed files with 3 additions and 2 deletions

View File

@ -640,7 +640,7 @@ int main (int argc, const char * argv[]) {
}
char filename[21];
sprintf(filename, "0x%04x_%03u%s.txt", uid, target_block, target_key == MC_AUTH_A ? "A" : "B");
sprintf(filename, "0x%08x_%03u%s.txt", uid, target_block, target_key == MC_AUTH_A ? "A" : "B");
fp = fopen(filename, "wb");
printf("Found tag with uid %04x, collecting nonces for key %s of block %u (sector %u) using known key %s %012"PRIx64" for block %u (sector %u)\n",

View File

@ -1,6 +1,7 @@
import sys
data = file(sys.argv[1], 'rb').readlines()
uid = sys.argv[1].replace('.txt','')
if sys.argv[1].endswith('.txt'):
uid = sys.argv[1][:-4]
def parity(x):
return ("{0:08b}".format(x).count('1') & 1)