nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

exo: amend pk21 restrictions

Browse source
This commit is contained in:
Michael Scire 2020-06-12 11:01:47 -07:00 committed by SciresM
parent 43f5a0ef45
commit c129256dd0
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
exosphere/program/source/boot/secmon_boot_functions.cpp
View file

@ -135,14 +135,12 @@ namespace ams::secmon::boot {
void UpdateBootConfigForPackage2Header(const pkg2::Package2Header &header) { void UpdateBootConfigForPackage2Header(const pkg2::Package2Header &header) {
/* Check for all-zeroes signature. */ /* Check for all-zeroes signature. */
bool is_decrypted = header.signature[0] == 0; const bool is_unsigned = header.signature[0] == 0 && crypto::IsSameBytes(header.signature, header.signature + 1, sizeof(header.signature) - 1);
is_decrypted &= crypto::IsSameBytes(header.signature, header.signature + 1, sizeof(header.signature) - 1); secmon::impl::GetBootConfigStorage()->signed_data.SetPackage2SignatureVerificationDisabled(is_unsigned);
/* Check for valid magic. */ /* Check for valid magic. */
is_decrypted &= crypto::IsSameBytes(header.meta.magic, pkg2::Package2Meta::Magic::String, sizeof(header.meta.magic)); const bool is_decrypted = crypto::IsSameBytes(header.meta.magic, pkg2::Package2Meta::Magic::String, sizeof(header.meta.magic));
secmon::impl::GetBootConfigStorage()->signed_data.SetPackage2EncryptionDisabled(is_decrypted);
/* Set the setting in boot config. */
secmon::impl::GetBootConfigStorage()->signed_data.SetPackage2Decrypted(is_decrypted);
} }
void VerifyPackage2HeaderSignature(pkg2::Package2Header &header, bool verify) { void VerifyPackage2HeaderSignature(pkg2::Package2Header &header, bool verify) {

8
libraries/libexosphere/include/exosphere/pkg1/pkg1_boot_config.hpp
View file

@ -123,8 +123,12 @@ namespace ams::pkg1 {
return (this->flags1[0] & (1 << 0)) != 0; return (this->flags1[0] & (1 << 0)) != 0;
} }
constexpr void SetPackage2Decrypted(bool decrypted) { constexpr void SetPackage2SignatureVerificationDisabled(bool decrypted) {
this->flags |= decrypted ? 0x3 : 0x0; this->flags |= decrypted ? (1 << 1) : (0 << 0);
}
constexpr void SetPackage2EncryptionDisabled(bool decrypted) {
this->flags |= decrypted ? (1 << 0) : (0 << 0);
} }
}; };
static_assert(util::is_pod<BootConfigSignedData>::value); static_assert(util::is_pod<BootConfigSignedData>::value);