borntohonk
commented
4 months ago Change to:
subprocess.run(f'hactoolnet --keyset prod.keys -t pk11 0100000000000819/romfs/a/package1 --outdir 0100000000000819/romfs/nx/pkg1', stdout = subprocess.DEVNULL)
This actually is not broken.
/a/ is for mariko.
/nx/ is for erista, the reason it's failing is because you do not have the appropriate keys. (they are not identical, but they produce the same master_key at the end)
the keys required are described in the README.md, but the tl:dr really is you need tsec_secret_26 (acl 0x00, https://switchbrew.org/wiki/TSEC#ACLs ) to derive package1key%% beyond 6.2.0, and tsec_secret_26 requires hardware glitching of the tsec aes scp key register and bruteforcing. (can be done with rcm payload, though none that do this task are public, and bruteforcing part is done on a pc)*
here's some reading material if you are interested in that, combined its all relevant, but plutoo's gist is what is required: disclaimer; none of these actually show you what you have to do, or tell you what to do:
https://gist.githubusercontent.com/plutooo/733318dbb57166d203c10d12f6c24e06/raw/15c5b2612ab62998243ce5e7877496466cabb77f/tsec.txt https://hexkyz.blogspot.com/2021/11/je-ne-sais-quoi-falcons-over-horizon.html https://www.unknowncheats.me/forum/3141470-post1.html https://github.com/vbe0201/faucon https://github.com/CAmadeus/falcon-tools https://gitlab.com/Nxyoom/tsec-exploration https://github.com/Thog/ghidra_falcon/releases/tag/master https://github.com/envytools/envytools "if you're using hekate you can try to replicate this with something like max77620_regulator_set_voltage(REGULATOR_SD0, 720000 + extra); and synchronize the start and end of the glitch using the falcon mailbox."
something like this:
things to get working:
stage 0:
verify keys in succession are dumped and written on screen/to sd card
stage 1:
if falcon mailbox X
print content of mailbox to screen/to sd card
verify screen/to sd card prints
stage 2:
stop if other mailbox
verify stop after recieving mailbox
stage 3:
if mailbox
print sor1
if other mailbox
stop
stage 4:
mass spam print sor1 of many csecrets
verify output
stage 5:
repeat with csigenc of 00
verify authhash/csecret 00 is printed to screen/to sd card
stage 6:
use mailbox condition to set voltage
print csigenc
use other mailbox to revertmain.asm (falcon heavysecure entry example for dumping acl 0x03 tsec secrets, built from requiem from https://github.com/CAmadeus/falcon-tools )
.section #ns_code
// Set up the Falcon stack pointer.
mov $r13 #FALCON_HWCFG
iord $r13 I[$r13]
shr b32 $r13 0x9
and $r13 0x1FF
shl b32 $r13 0x8
mov $sp $r13
lcall #main
exit
pushdef(`key_data_addr', `$r5')
main:
mov $r15 -0x10
add $sp -0x11C
mpush $r8
// Allocate memory for the Key Data table.
mov $r9 $sp
add b32 $r9 $r9 0xC4
and key_data_addr $r9 $r15
// Copy Key Data into DMEM.
mov b32 $r10 key_data_addr
mov $r11 #KEY_TABLE_START
mov $r12 #KEY_TABLE_SIZE
lcall #memcpy_i2d
// Copy the signed microcode portion to DMEM.
clear b32 $r10
mov $r11 #HS_PAYLOAD_PHYS_ADDR
ld b32 $r12 D[key_data_addr + 0x20]
lcall #memcpy_i2d
// Remap the signed microcode and tag it as secure.
mov b32 $r11 $r10
mov $r10 #HS_PAYLOAD_START
mov b32 $r13 $r10
mov $r14 0x1
lcall #memcpy_d2i
// Transfer the MAC of the secure payload into crypto register 6.
clear b32 $r7
mov b32 $r8 key_data_addr
sethi $r8 0x60000
cxset 0x2
xdst $r7 $r8
xdwait
// Transfer the seed for the fake-signing key into crypto register 7.
clear b32 $r7
add b32 $r8 key_data_addr 0x10
sethi $r8 0x70000
cxset 0x2
xdst $r7 $r8
xdwait
// Load in the cauth details for Heavy Secure mode authentication.
ld b32 $r9 D[key_data_addr + 0x20]
shl b32 $r9 0x10
mov $r15 #HS_PAYLOAD_START
shr b32 $r15 0x8
or $r9 $r15
mov $cauth $r9
// Jump to Heavy Secure Mode!
lcall #HS_PAYLOAD_START
mpopaddret $r8 0x11C
popdef(`key_data_addr')
include(`base_define.asm')
include(`mmio.asm')
include(`memcpy.asm')
include(`memcpy_i2d.asm')
include(`memcpy_d2i.asm')
include(`tsec_wait_dma.asm')
include(`tsec_dma_write.asm')
include(`tsec_set_key.asm')
.align 0x100
.section #ns_data 0x200
.equ #KEY_TABLE_SIZE 0x7C
KEY_TABLE_START:
HS_PAYLOAD_MAC: .skip 0x10
HS_PAYLOAD_SEED: .skip 0x10
HS_PAYLOAD_SIZE: .b32 0x00000000
.align 0x100
HS_PAYLOAD_PHYS_ADDR:
.section #hs_code 0x200
.equ #HS_PAYLOAD_START 0x200
hs_main:
mov $r11 #FALCON_MAILBOX1
mov $r12 0xBADC0DED
iowr I[$r11] $r12
// load csecret with acl value of 0x03 push it into sor1 with #tsec_set_key to be readable ( https://switchbrew.org/wiki/TSEC#Secrets )
csecret $c0 0x39 // loads the secret desired
cxset 0x2 // changes target for next operation to cryto instead of DMA
xdld $r10 $r10 // load from crypto to $r10, $r10 is equivelant of $c0
xdwait // waits for xdld with cxset to complete
lcall #tsec_set_key // this takes what is stored in $r10 and pushes it through sor1
// Clear the HS signature and return back to NS mode.
csigclr
ret
.align 0x100
mrdude2478
In both keygen files, you need to change to the following:
import argeparse
change to
import argparse
Also in the file: scripts/erista_keygen.py, you have an error on the path on line 21
Change to:
Modding both files fixes errors - you could also add a python requirements.txt , If not, users should run - "pip install argparse" to install that module to python.
Thanks for the keygens though, they work well.