mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
upgrade pdddbg to use basis decryption routines from the common libs
This commit is contained in:
parent
54e929e877
commit
4e2d79942e
2 changed files with 50 additions and 27 deletions
|
|
@ -765,7 +765,7 @@ def get_key(index, keyrom, length):
|
||||||
# - basis_credentials is a list of the secret Bases
|
# - basis_credentials is a list of the secret Bases
|
||||||
# Returns:
|
# Returns:
|
||||||
# - A dictionary of keys, by Basis name
|
# - A dictionary of keys, by Basis name
|
||||||
def extract_keys(keyrom, pddb, boot_pw, basis_credentials=None):
|
def extract_keys(keyrom, pddb, boot_pw, basis_credentials={}):
|
||||||
user_key_enc = get_key(40, keyrom, 32)
|
user_key_enc = get_key(40, keyrom, 32)
|
||||||
pepper = get_key(248, keyrom, 16)
|
pepper = get_key(248, keyrom, 16)
|
||||||
pepper[0] = pepper[0] ^ 1 # encodes the "boot" password type into the pepper
|
pepper[0] = pepper[0] ^ 1 # encodes the "boot" password type into the pepper
|
||||||
|
|
|
||||||
|
|
@ -19,39 +19,62 @@ def main():
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"--renode", required=False, help="Override flex-size settings and read a Renode bin file", action="store_true"
|
"--renode", required=False, help="Override flex-size settings and read a Renode bin file", action="store_true"
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--basis", type=str, help="Extra Bases to unlock, as `name:pass`. Each additional basis requires another --basis separator. Note that : is not legal to use in a Basis name.", action="append", nargs="+"
|
||||||
|
)
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
if args.name == None:
|
|
||||||
keyfile = './tools/pddb-images/pddb.key'
|
|
||||||
imagefile = './tools/pddb-images/pddb.bin'
|
|
||||||
else:
|
|
||||||
keyfile = './tools/pddb-images/{}.key'.format(args.name)
|
|
||||||
imagefile = './tools/pddb-images/{}.bin'.format(args.name)
|
|
||||||
|
|
||||||
if args.dump:
|
|
||||||
DO_CI_TESTS = False
|
|
||||||
|
|
||||||
numeric_level = getattr(logging, args.loglevel.upper(), None)
|
numeric_level = getattr(logging, args.loglevel.upper(), None)
|
||||||
if not isinstance(numeric_level, int):
|
if not isinstance(numeric_level, int):
|
||||||
raise ValueError('Invalid log level: %s' % args.loglevel)
|
raise ValueError('Invalid log level: %s' % args.loglevel)
|
||||||
logging.basicConfig(level=numeric_level)
|
logging.basicConfig(level=numeric_level)
|
||||||
|
|
||||||
keys = {}
|
|
||||||
with open(keyfile, 'rb') as key_f:
|
if args.renode is True:
|
||||||
raw_key = key_f.read()
|
keyfile = "./emulation/renode-keybox.bin"
|
||||||
num_keys = int.from_bytes(raw_key[:4], 'little')
|
imagefile = "./tools/pddb-images/renode.bin"
|
||||||
for i in range(num_keys):
|
basis_credentials = {}
|
||||||
name_all = raw_key[4 + i*128 : 4 + i*128 + 64]
|
if args.basis:
|
||||||
name_bytes = bytearray(b'')
|
for pair in args.basis:
|
||||||
for b in name_all:
|
credpair = pair[0].split(':', 1)
|
||||||
if b != 0:
|
if len(credpair) != 2:
|
||||||
name_bytes.append(b)
|
logging.error("Basis credential pair with name {} has a formatting problem, aborting!".format(credpair[0]))
|
||||||
else:
|
exit(1)
|
||||||
break
|
basis_credentials[credpair[0]] = credpair[1]
|
||||||
name = name_bytes.decode('utf8', errors='ignore')
|
|
||||||
key_data = raw_key[4 + i*128 + 64 : 4 + i*128 + 96]
|
with open(keyfile, 'rb') as key_f:
|
||||||
key_pt = raw_key[4 + i*128 + 96 : 4 + i*128 + 128]
|
keyrom = key_f.read()
|
||||||
keys[name] = [key_pt, key_data]
|
with open(imagefile, 'rb') as img_f:
|
||||||
|
raw_img = img_f.read()
|
||||||
|
raw_img = raw_img[0x01D80000:0x07F80000]
|
||||||
|
keys = extract_keys(keyrom, raw_img, 'a', basis_credentials)
|
||||||
|
else:
|
||||||
|
if args.name == None:
|
||||||
|
keyfile = './tools/pddb-images/pddb.key'
|
||||||
|
imagefile = './tools/pddb-images/pddb.bin'
|
||||||
|
else:
|
||||||
|
keyfile = './tools/pddb-images/{}.key'.format(args.name)
|
||||||
|
imagefile = './tools/pddb-images/{}.bin'.format(args.name)
|
||||||
|
|
||||||
|
if args.dump:
|
||||||
|
DO_CI_TESTS = False
|
||||||
|
|
||||||
|
keys = {}
|
||||||
|
with open(keyfile, 'rb') as key_f:
|
||||||
|
raw_key = key_f.read()
|
||||||
|
num_keys = int.from_bytes(raw_key[:4], 'little')
|
||||||
|
for i in range(num_keys):
|
||||||
|
name_all = raw_key[4 + i*128 : 4 + i*128 + 64]
|
||||||
|
name_bytes = bytearray(b'')
|
||||||
|
for b in name_all:
|
||||||
|
if b != 0:
|
||||||
|
name_bytes.append(b)
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
name = name_bytes.decode('utf8', errors='ignore')
|
||||||
|
key_data = raw_key[4 + i*128 + 64 : 4 + i*128 + 96]
|
||||||
|
key_pt = raw_key[4 + i*128 + 96 : 4 + i*128 + 128]
|
||||||
|
keys[name] = [key_pt.hex(), key_data.hex()]
|
||||||
|
|
||||||
logging.info("Found basis keys (pt, data):")
|
logging.info("Found basis keys (pt, data):")
|
||||||
logging.info(str(keys))
|
logging.info(str(keys))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue