Repository navigation
Conversation
Owner
|
@lugeke 谢谢,稀疏本体这个根因写得很清楚(三处同源、附原创合成夹具)。我们这边先跑 |
Owner
|
@lugeke 核完了,已进合入队列:
合进 main 后在这里贴提交号。 |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
问题与要证明什么
要证明的读数变化:带任天堂官方稀疏本体 NCA(
NcaFsHeader.ExistsSparseLayer() == true,修订版/带板载更新卡带常见,例如010097F018538000周年版 XCI,以及类似 #1511 中「本体第 0/1 段 2002-4644、第 2 段标志和控制数据正常」的现象)在nx_unpack --inspect时不再误报【校验跳过】+【原因 content_damaged】/【原因 keys_wrong】(rc=3),而是正常返回rc=0、0 警告、检出完整包元数据。根因(三处同源):
pack/nx_unpack/Inspect.cs:119-120:对kind == "base"无条件单独调用nca.OpenFileSystem(NcaSectionType.Code, ...)。任天堂修订版卡带会把本体程序被板载更新替换的 ExeFS(第 0 段)做成SparseInfo.Generation != 0、MetaSize == 0的空稀疏段;LibHac 单独读空稀疏段吐出全0x00→ 首轮触发块哈希不符打【校验跳过】→ 次轮跳过校验读分区头不是PFS0抛ResultFsPartitionSignatureVerificationFailed (2002-4644)。pack/nx_unpack/Program.cs:219:SiblingDecrypts()只排除了更新补丁段AesCtrEx,没有排除ExistsSparseLayer(),导致容器里只要有稀疏本体、同代别的内容正常,就会被误判成content_damaged(甚至在容器内另一代密钥真出错时也盖过keys_wrong)。pack/nx_unpack/Program.cs:459,481,515与VerifyReport()(276):无更新单独解包稀疏本体时直接打开稀疏段也会撞2002-4644误报损坏/密钥错,而不是明确提示「稀疏本体需配合更新包」。改动(只改了哪些文件)
pack/nx_unpack/Program.cs:IsSparseSection(Nca, NcaSectionType)(以 LibHac 原生NcaFsHeader.ExistsSparseLayer()判定)。SiblingDecrypts()排除ExistsSparseLayer()分段,与AesCtrEx同口径。VerifyReport()对稀疏段标明「没核对(稀疏段,要叠上更新才能读)」,不再单独调用VerifySection误报「不过」。Run()在patId == null(未提供更新)且本体Code/Data为稀疏段时直接抛SourceError,说明这是稀疏本体、需把对应更新包一起提供。pack/nx_unpack/Inspect.cs:kind == "base"的ProgramNCA 若IsSparseSection(nca, NcaSectionType.Code),跳过单独打开本体 ExeFS(保留guestIsa="unknown"、builds={},与nup_inspect/extract_inspect同形;pack/jobs/library.pyguest_isa()与pack/source_pick.py均优先从同容器或另行导入的update读取位数)。非稀疏 NCA 路径逐行不变。tests/nx_unpack_fail_test.sh:新增 3 份原创合成稀疏本体夹具(纯 Python AES-128 + 全假测试密钥,不含任何真实密钥或游戏数据)及 5 项回归断言。docs/坑记录.md:追加客观记录(现象 → 根因 → 实测读数 → 做法)。修前 → 修后读数
83d65735a)上tests/nx_unpack_fail_test.sh30 项,不通 4:不通 稀疏本体单独 --inspect、不通 稀疏本体 + 更新同容器 --inspect、不通 稀疏本体无更新单独解包、不通 同容器含稀疏本体 + 另一代密钥错误)tests/nx_unpack_fail_test.sh30/30 通过,不通 0)010097F018538000周年版,整文件 SHA-256 匹配官方内容号)--inspectrc=3(【校验跳过】+【原因 content_damaged】) → 修后rc=0、stderr 0 字节、检出全部 4 个包(本体 + 更新aarch64+ 附赠程序aarch64+ DLC)与封面gate_route列出的nx_unpack/npdm_isa/docs套件 +test_import.py)nx_unpack_fail30/30、nx_unpack_nczPASS、nx_unpack_romfs47/47、nx_unpack_symlink2/2、nx_unpack_zbic24/24+5、npdm_isa12/12、docs_consistency24/24、pack/jobs/tests/test_import.py32/32负对照
在当前分支上仅回退
pack/nx_unpack/Inspect.cs与pack/nx_unpack/Program.cs到HEAD~1(保留新增单测),重跑bash tests/nx_unpack_fail_test.sh:✗ nx_unpack 解包失败回归:30 项,不通 4),分别红在稀疏本体单独 --inspect、稀疏本体 + 更新同容器 --inspect、稀疏本体无更新单独解包、同容器含稀疏本体 + 另一代密钥错误。射程
tests/nx_unpack_fail_test.sh30 项(含新增 5 项稀疏本体用例,覆盖单本体--inspect、本体+更新同容器--inspect、--exefs-only解包、无更新单独解包、同容器含稀疏本体 + 另一代密钥错误)、nx_unpack_ncz/romfs(47 项) /symlink(2 项) /zbic(24 项+5) /npdm_isa(12 项) /docs_consistency(24 项) /pack/jobs/tests/test_import.py(32 项),全部 0 不符。010097F018538000)--inspect与--exefs-only/S2A_NXUNPACK_ROMFS_HEADER=1,0 局实机游戏。一级自检
本机系统自带 bash 为
3.2.57,缺少 Homebrewbash 5,bash tools/contrib_check.sh --base origin/main在前置环境检查以rc=2退出(未生成摘要);本次终端原文如下(已单独跑完上述nx_unpack/docs/test_import全部路由单测):苹果路径不受影响的证明(改共用目录时必写)
pack/nx_unpack/{Inspect.cs,Program.cs}(加ExistsSparseLayer()判定)、tests/nx_unpack_fail_test.sh与docs/坑记录.md。ExistsSparseLayer()恒为false,解析与解包路径逐字节不变;原有nx_unpack5 套回归与npdm_isa、test_import全部通过。限制 / 未测项 / 后续
bash 5的整套tools/contrib_check.sh其余 47 项非nx_unpack路由单测,交由合入队列门禁补齐。guestIsa暂为unknown(不拦截导入),补齐更新包后即由更新包提供aarch64并正常解包出包;若未配更新包直接解包,本次改动会给出明确的稀疏本体缺更新提示。