mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
some more fixes to pddbg to bring it up to v2. now passing CI.
This commit is contained in:
parent
2d0af08266
commit
758ed1ba31
1 changed files with 10 additions and 11 deletions
|
|
@ -14,15 +14,7 @@ PAGE_SIZE = 4096
|
||||||
VPAGE_SIZE = 4064
|
VPAGE_SIZE = 4064
|
||||||
MBBB_PAGES = 10
|
MBBB_PAGES = 10
|
||||||
DO_CI_TESTS = True
|
DO_CI_TESTS = True
|
||||||
|
VERSION = 0x02_01
|
||||||
# PDDB version number is encoded here
|
|
||||||
def basis_aad(name, version=0x02_01, dna=0):
|
|
||||||
name_bytes = bytearray(name, 'utf-8')
|
|
||||||
# name_bytes += bytearray(([0] * (Basis.MAX_NAME_LEN - len(name))))
|
|
||||||
name_bytes += version.to_bytes(4, 'little')
|
|
||||||
name_bytes += dna.to_bytes(8, 'little')
|
|
||||||
|
|
||||||
return name_bytes
|
|
||||||
|
|
||||||
# build a table mapping all non-printable characters to None
|
# build a table mapping all non-printable characters to None
|
||||||
NOPRINT_TRANS_TABLE = {
|
NOPRINT_TRANS_TABLE = {
|
||||||
|
|
@ -146,6 +138,13 @@ def keycommit_decrypt(key, aad, pp_data):
|
||||||
raise Exception(ValueError)
|
raise Exception(ValueError)
|
||||||
return pt_data
|
return pt_data
|
||||||
|
|
||||||
|
def basis_aad(name, version=VERSION, dna=0):
|
||||||
|
name_bytes = bytearray(name, 'utf-8')
|
||||||
|
# name_bytes += bytearray(([0] * (Basis.MAX_NAME_LEN - len(name))))
|
||||||
|
name_bytes += version.to_bytes(4, 'little')
|
||||||
|
name_bytes += dna.to_bytes(8, 'little')
|
||||||
|
|
||||||
|
return name_bytes
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
global DO_CI_TESTS
|
global DO_CI_TESTS
|
||||||
|
|
@ -758,7 +757,7 @@ class Fscb:
|
||||||
logging.warning("Duplicate journal number found:\n {} (in table)\n {} (incoming)".format(cur_pp.as_str(), pp.as_str()))
|
logging.warning("Duplicate journal number found:\n {} (in table)\n {} (incoming)".format(cur_pp.as_str(), pp.as_str()))
|
||||||
|
|
||||||
# this is the "AAD" used to encrypt the FastSpace
|
# this is the "AAD" used to encrypt the FastSpace
|
||||||
def aad(version=0x01_01, dna=0):
|
def aad(version=VERSION, dna=0):
|
||||||
return bytearray([46, 70, 97, 115, 116, 83, 112, 97, 99, 101]) + version.to_bytes(4, 'little') + dna.to_bytes(8, 'little')
|
return bytearray([46, 70, 97, 115, 116, 83, 112, 97, 99, 101]) + version.to_bytes(4, 'little') + dna.to_bytes(8, 'little')
|
||||||
|
|
||||||
class SpaceUpdate:
|
class SpaceUpdate:
|
||||||
|
|
@ -819,7 +818,7 @@ def decode_fscb(img, keys, FSCB_LEN_PAGES=2):
|
||||||
fscb = None
|
fscb = None
|
||||||
|
|
||||||
if fscb != None:
|
if fscb != None:
|
||||||
logging.debug("key: {}".format(key.hex()))
|
logging.debug("key: {}".format(key[1].hex()))
|
||||||
cipher = AES.new(key[0], AES.MODE_ECB)
|
cipher = AES.new(key[0], AES.MODE_ECB)
|
||||||
for update in space_update:
|
for update in space_update:
|
||||||
entries = [update[i:i+SpaceUpdate.SU_LEN] for i in range(0, len(update), SpaceUpdate.SU_LEN)]
|
entries = [update[i:i+SpaceUpdate.SU_LEN] for i in range(0, len(update), SpaceUpdate.SU_LEN)]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue