adapting text

This commit is contained in:
iceman1001 2021-04-15 22:24:20 +02:00
commit 92bb8d38bc
2 changed files with 14 additions and 17 deletions

View file

@ -684,7 +684,7 @@ print STDERR "\n";
$uid = uc $uid; $uid = uc $uid;
#print STDERR "amiitool -d -k ../client/amiitool/key_retail.bin -i $input -o $input.decrypted\n"; #print STDERR "amiitool -d -k ../client/amiitool/key_retail.bin -i $input -o $input.decrypted\n";
$input =~ s/\....$//; $input =~ s/\....$//;
print STDERR "hf mf eload u $input\n"; print STDERR "hf mfu eload --u $input\n";
print STDERR "hf 14a sim -t 7 -u $uid\n"; print STDERR "hf 14a sim -t 7 -u $uid\n";

View file

@ -27,11 +27,11 @@
# #
# Get first line from EML file (block0) and write it down using command # Get first line from EML file (block0) and write it down using command
# #
# Place it here # Place it here
# | # |
# | # |
# v # v
# hf mf wrbl 0 B FFFFFFFFFFFF 046E46AAA53480084400120111003113 # hf mf wrbl --blk 0 -b -k FFFFFFFFFFFF -d 046E46AAA53480084400120111003113
# #
# Now restore all the data using built-in restore command # Now restore all the data using built-in restore command
# #
@ -73,15 +73,12 @@
# #
# #
import subprocess import subprocess
# EML data var te get keys of # EML data var te get keys of
EML_FILE_DATA = """PLACE RAW hf-mf-CARD_UID-dump.eml FILE CONTENT OF CURRENTLY LOADED CARD HERE""" EML_FILE_DATA = """PLACE RAW hf-mf-CARD_UID-dump.eml FILE CONTENT OF CURRENTLY LOADED CARD HERE"""
# Change your device name here if it differs from the default Proxmark3 RDV4.0 # Change your device name here if it differs from the default Proxmark3 RDV4.0
PROXMARK_BIN_EXEC_STRING = 'proxmark3 -c "%s" /dev/tty.usbmodemiceman1' PROXMARK_BIN_EXEC_STRING = './pm3 -c "%s"'
# Constants # Constants
DEFAULT_ACCESS_BLOCK = "FFFFFFFFFFFFFF078000FFFFFFFFFFFF" DEFAULT_ACCESS_BLOCK = "FFFFFFFFFFFFFF078000FFFFFFFFFFFF"
F12_KEY = "FFFFFFFFFFFF" F12_KEY = "FFFFFFFFFFFF"
@ -95,7 +92,7 @@ def exec_proxmark_cmd(command, retry = 2, input=""):
proxmark_reply = rst.stdout.decode("utf-8") proxmark_reply = rst.stdout.decode("utf-8")
proxmark_status = proxmark_reply.splitlines()[-1:][0].strip() proxmark_status = proxmark_reply.splitlines()[-1:][0].strip()
if proxmark_status == "isOk:01": if proxmark_status == "ok":
return True, "Success: " + proxmark_status return True, "Success: " + proxmark_status
retry_c += 1 retry_c += 1
return False, "Error: %s , status %s" % (proxmark_reply.splitlines()[-2:][0], proxmark_status) return False, "Error: %s , status %s" % (proxmark_reply.splitlines()[-2:][0], proxmark_status)
@ -128,19 +125,19 @@ for sector in sector_array:
key_B = sector[3][-12:] key_B = sector[3][-12:]
for _block in range(0,4): for _block in range(0,4):
if sector_array.index(sector) == 0 and block == 0: if sector_array.index(sector) == 0 and block == 0:
write_status, verbose = exec_proxmark_cmd("hf mf wrbl %s B %s %s" % (block, key_B, sector[0])) write_status, verbose = exec_proxmark_cmd("hf mf wrbl --blk %s -b -k %s -d %s" % (block, key_B, sector[0]))
if not write_status: if not write_status:
write_status, verbose = exec_proxmark_cmd("hf mf wrbl %s A %s %s" % (block, key_A, sector[0])) write_status, verbose = exec_proxmark_cmd("hf mf wrbl --blk %s -a -k %s -d %s" % (block, key_A, sector[0]))
if not write_status: if not write_status:
write_status, verbose = exec_proxmark_cmd("hf mf wrbl %s A %s %s" % (block, F12_KEY, sector[0])) write_status, verbose = exec_proxmark_cmd("hf mf wrbl --blk %s -a -k %s -d %s" % (block, F12_KEY, sector[0]))
block_success[block] = verbose block_success[block] = verbose
elif _block == 3: elif _block == 3:
write_status, verbose = exec_proxmark_cmd("hf mf wrbl %s B %s %s" % (block, key_B, DEFAULT_ACCESS_BLOCK)) write_status, verbose = exec_proxmark_cmd("hf mf wrbl --blk %s -b -k %s -d %s" % (block, key_B, DEFAULT_ACCESS_BLOCK))
if not write_status: if not write_status:
write_status, verbose = exec_proxmark_cmd("hf mf wrbl %s A %s %s" % (block, key_A, DEFAULT_ACCESS_BLOCK)) write_status, verbose = exec_proxmark_cmd("hf mf wrbl --blk %s -a -k %s -d %s" % (block, key_A, DEFAULT_ACCESS_BLOCK))
if not write_status: if not write_status:
write_status, verbose = exec_proxmark_cmd("hf mf wrbl %s A %s %s" % (block, F12_KEY, DEFAULT_ACCESS_BLOCK)) write_status, verbose = exec_proxmark_cmd("hf mf wrbl --blk %s -a -k %s -d %s" % (block, F12_KEY, DEFAULT_ACCESS_BLOCK))
block_success[block] = verbose block_success[block] = verbose
_block += 1 _block += 1