Open
Conversation
"/* Support to FW XX.0.0 */" was not part of the original code by shchmue, but added in later by someone else, and it's also redundant, since "#define KB_FIRMWARE_VERSION_XXXX XX" already tells you which version it supports.
shchmue always used trailing commas in each of the latest keys they added, so I've reimplemented that same approach here, as to keep it standard and make it easier to add new keys.
"Master key 0F" is written twice, but the last one was supposed to be "Master key 10".
"0xF9, 0x62, 0x05, 0x99, 0xE0, 0xB9, 0xA6, 0x9B, 0x9D, 0xAA, 0xB4, 0x12, 0x0B, 0x0F, 0xF5, 0x8F" was taken from "Device Master Key Source Sources.", not "Production Device Master Kek Sources.", and it has been replaced with the proper "0x92, 0xBF, 0x37, 0x80, 0x0E, 0x79, 0x56, 0x8C, 0x57, 0x75, 0x72, 0x0A, 0x48, 0xD8, 0x15, 0x39" key. "0x74, 0xB2, 0x5F, 0xA0, 0x4B, 0x74, 0x6D, 0x47, 0x5B, 0xA9, 0xF5, 0x26, 0x46, 0xD7, 0x4B, 0x6E" was taken from "Development Master Key Vectors.", not "Development Device Master Kek Sources.", and it has been replaced with the proper "0x7A, 0x4C, 0x38, 0xB7, 0x03, 0x6B, 0x1E, 0x81, 0x20, 0x53, 0x14, 0x99, 0xA4, 0x21, 0x92, 0x9F" key.
… -- fusee_key_derivation.cpp" commit reworked Fixed and cleaned up key-source comments so they consistently use the right local names and (when available) the matching names from secmon_boot_key_data.s and fusee_key_derivation.cpp, removed labels that didn’t actually match, and added a few missing ones. Also removed the trailing whitespace that was after "(MasterKeySource) */".
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
1 participant
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.
Tested and working on Erista. Don't have a Mariko to test on.