From 2db35b1696e53b20544d0440c0565b44acf81234 Mon Sep 17 00:00:00 2001 From: yutaka Date: Mon, 7 Jan 2008 04:58:00 +0000 Subject: [PATCH] =?UTF-8?q?=E9=8D=B5=E9=81=B8=E6=8A=9E=E3=82=92FIRM=5FUSE?= =?UTF-8?q?=5FTWLSDK=5FKEYS=E3=81=A8=E9=96=A2=E9=80=A3=E4=BB=98=E3=81=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@427 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/gcdfirm/sdmc-launcher/ARM9/main.c | 4 ++++ build/nandfirm/menu-launcher/ARM9/main.c | 7 +++---- build/nandfirm/menu-launcher2/ARM9/main.c | 7 +++---- build/nandfirm/sdmc-launcher/ARM9/main.c | 4 ++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build/gcdfirm/sdmc-launcher/ARM9/main.c b/build/gcdfirm/sdmc-launcher/ARM9/main.c index 0138a814..b64d5c3a 100644 --- a/build/gcdfirm/sdmc-launcher/ARM9/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM9/main.c @@ -16,6 +16,9 @@ *---------------------------------------------------------------------------*/ #include +#ifndef FIRM_USE_TWLSDK_KEYS +#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[2] // 鍵管理.xls参照 +#else #define RSA_KEY_ADDR rsa_key static const u8 rsa_key[128] = { @@ -29,6 +32,7 @@ static const u8 rsa_key[128] = 0xe0, 0x6d, 0x21, 0x00, 0xcd, 0x42, 0xd8, 0x84, 0x85, 0xe3, 0xb2, 0x02, 0x1a, 0xa5, 0x89, 0x02, 0xa1, 0x96, 0xc6, 0xf7, 0x61, 0x68, 0x66, 0xe6, 0x65, 0x12, 0xb7, 0xf1, 0x49 }; +#endif #define RSA_HEAP_SIZE (4*1024) // RSA用ヒープサイズ (サイズ調整必要) diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c index 9648c1a1..bd2faf25 100644 --- a/build/nandfirm/menu-launcher/ARM9/main.c +++ b/build/nandfirm/menu-launcher/ARM9/main.c @@ -16,9 +16,8 @@ *---------------------------------------------------------------------------*/ #include -/* 鍵はどこへ？ */ -#if 0 -#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[7] +#ifndef FIRM_USE_TWLSDK_KEYS +#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[0] // 鍵管理.xls参照 #else #define RSA_KEY_ADDR rsa_key static const u8 rsa_key[128] = @@ -40,7 +39,7 @@ static const u8 rsa_key[128] = static u8 acHeap[RSA_HEAP_SIZE] __attribute__ ((aligned (32))); static SVCSignHeapContext acPool; -#define MENU_TITLE_ID 0x000100014c4e4352ULL +#define MENU_TITLE_ID 0x000300074c4e4352ULL /* PROFILE_ENABLE を定義するとある程度のパフォーマンスチェックができます。 diff --git a/build/nandfirm/menu-launcher2/ARM9/main.c b/build/nandfirm/menu-launcher2/ARM9/main.c index 759c7028..5f838097 100644 --- a/build/nandfirm/menu-launcher2/ARM9/main.c +++ b/build/nandfirm/menu-launcher2/ARM9/main.c @@ -17,9 +17,8 @@ #include #include -/* 鍵はどこへ？ */ -#if 0 -#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[7] +#ifndef FIRM_USE_TWLSDK_KEYS +#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[0] // 鍵管理.xls参照 #else #define RSA_KEY_ADDR rsa_key static const u8 rsa_key[128] = @@ -41,7 +40,7 @@ static const u8 rsa_key[128] = static u8 acHeap[RSA_HEAP_SIZE] __attribute__ ((aligned (32))); static SVCSignHeapContext acPool; -#define MENU_TITLE_ID 0x000100014c4e4352ULL +#define MENU_TITLE_ID 0x000300074c4e4352ULL /* PROFILE_ENABLE を定義するとある程度のパフォーマンスチェックができます。 diff --git a/build/nandfirm/sdmc-launcher/ARM9/main.c b/build/nandfirm/sdmc-launcher/ARM9/main.c index 0138a814..b64d5c3a 100644 --- a/build/nandfirm/sdmc-launcher/ARM9/main.c +++ b/build/nandfirm/sdmc-launcher/ARM9/main.c @@ -16,6 +16,9 @@ *---------------------------------------------------------------------------*/ #include +#ifndef FIRM_USE_TWLSDK_KEYS +#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[2] // 鍵管理.xls参照 +#else #define RSA_KEY_ADDR rsa_key static const u8 rsa_key[128] = { @@ -29,6 +32,7 @@ static const u8 rsa_key[128] = 0xe0, 0x6d, 0x21, 0x00, 0xcd, 0x42, 0xd8, 0x84, 0x85, 0xe3, 0xb2, 0x02, 0x1a, 0xa5, 0x89, 0x02, 0xa1, 0x96, 0xc6, 0xf7, 0x61, 0x68, 0x66, 0xe6, 0x65, 0x12, 0xb7, 0xf1, 0x49 }; +#endif #define RSA_HEAP_SIZE (4*1024) // RSA用ヒープサイズ (サイズ調整必要)