diff --git a/exosphere/src/package2.c b/exosphere/src/package2.c index 6e1620bc1..aeafd88d3 100644 --- a/exosphere/src/package2.c +++ b/exosphere/src/package2.c @@ -304,7 +304,7 @@ static bool validate_package2_metadata(package2_meta_t *metadata) { /* Perform version checks. */ /* We will be compatible with all package2s released before current, but not newer ones. */ - if (metadata->version_max >= PACKAGE2_MINVER_THEORETICAL && metadata->version_min < PACKAGE2_MAXVER_500_CURRENT) { + if (metadata->version_max >= PACKAGE2_MINVER_THEORETICAL && metadata->version_min < PACKAGE2_MAXVER_600_CURRENT) { return true; } @@ -331,7 +331,7 @@ static uint32_t decrypt_and_validate_header(package2_header_t *header) { } /* Ensure we successfully decrypted the header. */ - if (mkey_rev > mkey_get_revision()) { + if (mkey_rev > mkey_get_revision()) { panic(0xFAF00003); } } else if (!validate_package2_metadata(&header->metadata)) { diff --git a/exosphere/src/package2.h b/exosphere/src/package2.h index ec0dfba3e..9553fa8fe 100644 --- a/exosphere/src/package2.h +++ b/exosphere/src/package2.h @@ -66,14 +66,16 @@ static inline uintptr_t get_nx_bootloader_mailbox_base(void) { #define PACKAGE2_MAXVER_300 0x4 #define PACKAGE2_MAXVER_302 0x5 #define PACKAGE2_MAXVER_400_410 0x6 -#define PACKAGE2_MAXVER_500_CURRENT 0x7 +#define PACKAGE2_MAXVER_500_510 0x7 +#define PACKAGE2_MAXVER_600_CURRENT 0x8 #define PACKAGE2_MINVER_100 0x3 #define PACKAGE2_MINVER_200 0x4 #define PACKAGE2_MINVER_300 0x5 #define PACKAGE2_MINVER_302 0x6 #define PACKAGE2_MINVER_400_410 0x7 -#define PACKAGE2_MINVER_500_CURRENT 0x8 +#define PACKAGE2_MINVER_500_510 0x8 +#define PACKAGE2_MINVER_600_CURRENT 0x9 typedef struct { union {