mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-21 19:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

strat: ldr::PlatformId -> ncm::ContentMetaPlatform

Browse Source
This commit is contained in:
Michael Scire 2024-10-29 19:24:52 -07:00
parent 989fb7be0c
commit e590e1adc5
5 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstratosphere/include/stratosphere/fssystem/fssystem_crypto_configuration.hpp
View File

@ -16,7 +16,7 @@
#pragma once #pragma once
#include <vapours.hpp> #include <vapours.hpp>
#include <stratosphere/fssystem/fssystem_nca_file_system_driver.hpp> #include <stratosphere/fssystem/fssystem_nca_file_system_driver.hpp>
#include <stratosphere/ldr/ldr_platform_id.hpp> #include <stratosphere/ncm/ncm_content_meta_platform.hpp>
namespace ams::fssystem { namespace ams::fssystem {
@ -26,10 +26,10 @@ namespace ams::fssystem {
void InvalidateHardwareAesKey(); void InvalidateHardwareAesKey();
bool IsValidSignatureKeyGeneration(ldr::PlatformId platform, size_t key_generation); bool IsValidSignatureKeyGeneration(ncm::ContentMetaPlatform platform, size_t key_generation);
const u8 *GetAcidSignatureKeyModulus(ldr::PlatformId platform, bool prod, size_t key_generation, bool unk_unused); const u8 *GetAcidSignatureKeyModulus(ncm::ContentMetaPlatform platform, bool prod, size_t key_generation, bool unk_unused);
size_t GetAcidSignatureKeyModulusSize(ldr::PlatformId platform, bool unk_unused); size_t GetAcidSignatureKeyModulusSize(ncm::ContentMetaPlatform platform, bool unk_unused);
const u8 *GetAcidSignatureKeyPublicExponent(); const u8 *GetAcidSignatureKeyPublicExponent();

27
libstratosphere/include/stratosphere/ldr/ldr_platform_id.hpp
View File

@ -1,27 +0,0 @@
/*
* Copyright (c) Atmosphère-NX
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <vapours.hpp>
namespace ams::ldr {
/* TODO: Is this really a FS type? What namespace does this actually live inside? */
enum PlatformId {
PlatformId_Nx = 0,
};
}

2
libstratosphere/include/stratosphere/ldr/ldr_types.hpp
View File

@ -19,7 +19,7 @@
#include <stratosphere/ncm/ncm_ids.hpp> #include <stratosphere/ncm/ncm_ids.hpp>
#include <stratosphere/ncm/ncm_program_location.hpp> #include <stratosphere/ncm/ncm_program_location.hpp>
#include <stratosphere/sf/sf_buffer_tags.hpp> #include <stratosphere/sf/sf_buffer_tags.hpp>
#include <stratosphere/ldr/ldr_platform_id.hpp> #include <stratosphere/ncm/ncm_content_meta_platform.hpp>
namespace ams::ldr { namespace ams::ldr {

2
libstratosphere/source/erpt/srv/erpt_srv_reporter.cpp
View File

@ -537,6 +537,8 @@ namespace ams::erpt::srv {
/* NOTE: Nintendo ignores the result of this call. */ /* NOTE: Nintendo ignores the result of this call. */
SubmitFsInfo(); SubmitFsInfo();
} }
#else
AMS_UNUSED(flags);
#endif #endif

12
libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp
View File

@ -297,20 +297,20 @@ namespace ams::fssystem {
} }
} }
bool IsValidSignatureKeyGeneration(ldr::PlatformId platform, size_t key_generation) { bool IsValidSignatureKeyGeneration(ncm::ContentMetaPlatform platform, size_t key_generation) {
switch (platform) { switch (platform) {
case ldr::PlatformId_Nx: case ncm::ContentMetaPlatform::Nx:
return key_generation <= NxAcidSignatureKeyGenerationMax; return key_generation <= NxAcidSignatureKeyGenerationMax;
AMS_UNREACHABLE_DEFAULT_CASE(); AMS_UNREACHABLE_DEFAULT_CASE();
} }
} }
const u8 *GetAcidSignatureKeyModulus(ldr::PlatformId platform, bool prod, size_t key_generation, bool unk_unused) { const u8 *GetAcidSignatureKeyModulus(ncm::ContentMetaPlatform platform, bool prod, size_t key_generation, bool unk_unused) {
AMS_ASSERT(IsValidSignatureKeyGeneration(platform, key_generation)); AMS_ASSERT(IsValidSignatureKeyGeneration(platform, key_generation));
AMS_UNUSED(unk_unused); AMS_UNUSED(unk_unused);
switch (platform) { switch (platform) {
case ldr::PlatformId_Nx: case ncm::ContentMetaPlatform::Nx:
{ {
const size_t used_keygen = (key_generation % (NxAcidSignatureKeyGenerationMax + 1)); const size_t used_keygen = (key_generation % (NxAcidSignatureKeyGenerationMax + 1));
return prod ? NxAcidSignatureKeyModulusProd[used_keygen] : NxAcidSignatureKeyModulusDev[used_keygen]; return prod ? NxAcidSignatureKeyModulusProd[used_keygen] : NxAcidSignatureKeyModulusDev[used_keygen];
@ -319,11 +319,11 @@ namespace ams::fssystem {
} }
} }
size_t GetAcidSignatureKeyModulusSize(ldr::PlatformId platform, bool unk_unused) { size_t GetAcidSignatureKeyModulusSize(ncm::ContentMetaPlatform platform, bool unk_unused) {
AMS_UNUSED(unk_unused); AMS_UNUSED(unk_unused);
switch (platform) { switch (platform) {
case ldr::PlatformId_Nx: case ncm::ContentMetaPlatform::Nx:
return NxAcidSignatureKeyModulusSize; return NxAcidSignatureKeyModulusSize;
AMS_UNREACHABLE_DEFAULT_CASE(); AMS_UNREACHABLE_DEFAULT_CASE();
} }