From d165ec71625c080771cc5b3c40f6223e111a3573 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 12 Jun 2020 03:27:29 -0700 Subject: [PATCH] stratosphere: fix command availability to include minor versions --- .../include/stratosphere/ncm/ncm_i_content_storage.hpp | 4 ++-- stratosphere/spl/source/spl_deprecated_service.hpp | 2 +- stratosphere/spl/source/spl_es_service.hpp | 4 ++-- stratosphere/spl/source/spl_fs_service.hpp | 2 +- stratosphere/spl/source/spl_manu_service.hpp | 2 +- stratosphere/spl/source/spl_ssl_service.hpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp index f310278a8..abe070674 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp @@ -113,9 +113,9 @@ namespace ams::ncm { MAKE_SERVICE_COMMAND_META(RevertToPlaceHolder, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(SetPlaceHolderSize, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(ReadContentIdFile, hos::Version_2_0_0), - MAKE_SERVICE_COMMAND_META(GetRightsIdFromPlaceHolderIdDeprecated, hos::Version_2_0_0, hos::Version_2_0_0), + MAKE_SERVICE_COMMAND_META(GetRightsIdFromPlaceHolderIdDeprecated, hos::Version_2_0_0, hos::Version_2_3_0), MAKE_SERVICE_COMMAND_META(GetRightsIdFromPlaceHolderId, hos::Version_3_0_0), - MAKE_SERVICE_COMMAND_META(GetRightsIdFromContentIdDeprecated, hos::Version_2_0_0, hos::Version_2_0_0), + MAKE_SERVICE_COMMAND_META(GetRightsIdFromContentIdDeprecated, hos::Version_2_0_0, hos::Version_2_3_0), MAKE_SERVICE_COMMAND_META(GetRightsIdFromContentId, hos::Version_3_0_0), MAKE_SERVICE_COMMAND_META(WriteContentForDebug, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(GetFreeSpaceSize, hos::Version_2_0_0), diff --git a/stratosphere/spl/source/spl_deprecated_service.hpp b/stratosphere/spl/source/spl_deprecated_service.hpp index 76c86138b..11d49a7d9 100644 --- a/stratosphere/spl/source/spl_deprecated_service.hpp +++ b/stratosphere/spl/source/spl_deprecated_service.hpp @@ -114,7 +114,7 @@ namespace ams::spl { MAKE_SERVICE_COMMAND_META(LoadTitleKey), - MAKE_SERVICE_COMMAND_META(UnwrapCommonTitleKeyDeprecated, hos::Version_2_0_0, hos::Version_2_0_0), + MAKE_SERVICE_COMMAND_META(UnwrapCommonTitleKeyDeprecated, hos::Version_2_0_0, hos::Version_2_3_0), MAKE_SERVICE_COMMAND_META(UnwrapCommonTitleKey, hos::Version_3_0_0), MAKE_SERVICE_COMMAND_META(AllocateAesKeyslot /* Atmosphere extension: This was added in hos::Version_2_0_0, but is allowed on older firmware by atmosphere. */), diff --git a/stratosphere/spl/source/spl_es_service.hpp b/stratosphere/spl/source/spl_es_service.hpp index 829cc4a86..abbe0b59b 100644 --- a/stratosphere/spl/source/spl_es_service.hpp +++ b/stratosphere/spl/source/spl_es_service.hpp @@ -50,9 +50,9 @@ namespace ams::spl { MAKE_SERVICE_COMMAND_META(AllocateAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(FreeAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(GetAesKeyslotAvailableEvent, hos::Version_2_0_0), - MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKeyDeprecated, hos::Version_4_0_0, hos::Version_4_0_0), + MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKeyDeprecated, hos::Version_4_0_0, hos::Version_4_1_0), MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKey, hos::Version_5_0_0), - MAKE_SERVICE_COMMAND_META(ImportEsKeyDeprecated, hos::Version_4_0_0, hos::Version_4_0_0), + MAKE_SERVICE_COMMAND_META(ImportEsKeyDeprecated, hos::Version_4_0_0, hos::Version_4_1_0), MAKE_SERVICE_COMMAND_META(ImportEsKey, hos::Version_5_0_0), MAKE_SERVICE_COMMAND_META(UnwrapTitleKey), MAKE_SERVICE_COMMAND_META(UnwrapCommonTitleKey, hos::Version_2_0_0), diff --git a/stratosphere/spl/source/spl_fs_service.hpp b/stratosphere/spl/source/spl_fs_service.hpp index b9a48781f..eace4735f 100644 --- a/stratosphere/spl/source/spl_fs_service.hpp +++ b/stratosphere/spl/source/spl_fs_service.hpp @@ -48,7 +48,7 @@ namespace ams::spl { MAKE_SERVICE_COMMAND_META(AllocateAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(FreeAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(GetAesKeyslotAvailableEvent, hos::Version_2_0_0), - MAKE_SERVICE_COMMAND_META(ImportLotusKeyDeprecated, hos::Version_4_0_0, hos::Version_4_0_0), + MAKE_SERVICE_COMMAND_META(ImportLotusKeyDeprecated, hos::Version_4_0_0, hos::Version_4_1_0), MAKE_SERVICE_COMMAND_META(ImportLotusKey, hos::Version_5_0_0), MAKE_SERVICE_COMMAND_META(DecryptLotusMessage), MAKE_SERVICE_COMMAND_META(GenerateSpecificAesKey), diff --git a/stratosphere/spl/source/spl_manu_service.hpp b/stratosphere/spl/source/spl_manu_service.hpp index b9afbb6f4..9e6342369 100644 --- a/stratosphere/spl/source/spl_manu_service.hpp +++ b/stratosphere/spl/source/spl_manu_service.hpp @@ -44,7 +44,7 @@ namespace ams::spl { MAKE_SERVICE_COMMAND_META(AllocateAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(FreeAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(GetAesKeyslotAvailableEvent, hos::Version_2_0_0), - MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKeyDeprecated, hos::Version_4_0_0, hos::Version_4_0_0), + MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKeyDeprecated, hos::Version_4_0_0, hos::Version_4_1_0), MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKey, hos::Version_5_0_0), MAKE_SERVICE_COMMAND_META(ReEncryptRsaPrivateKey, hos::Version_5_0_0), }; diff --git a/stratosphere/spl/source/spl_ssl_service.hpp b/stratosphere/spl/source/spl_ssl_service.hpp index dfdeb6ac0..ba213b309 100644 --- a/stratosphere/spl/source/spl_ssl_service.hpp +++ b/stratosphere/spl/source/spl_ssl_service.hpp @@ -44,7 +44,7 @@ namespace ams::spl { MAKE_SERVICE_COMMAND_META(AllocateAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(FreeAesKeyslot, hos::Version_2_0_0), MAKE_SERVICE_COMMAND_META(GetAesKeyslotAvailableEvent, hos::Version_2_0_0), - MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKeyDeprecated, hos::Version_4_0_0, hos::Version_4_0_0), + MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKeyDeprecated, hos::Version_4_0_0, hos::Version_4_1_0), MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKey, hos::Version_5_0_0), MAKE_SERVICE_COMMAND_META(ImportSslKey, hos::Version_5_0_0), MAKE_SERVICE_COMMAND_META(SslExpMod, hos::Version_5_0_0),