権限を絞ったdescに変更

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@275 385bec56-5757-e545-9c3a-d8741f4650f1

trunk/KENJEraser/DSiWareDeleteTool.desc

@@ -0,0 +1,229 @@
+AccessControlDescriptor: 
+  AffinityMask: 1
+  AutoGen: true
+  CoreVersion: 2
+  DescVersion: 2
+  Descriptor: |
+    AP///wAABAACAAAAAAAFGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiIEAAAAAAABBUFQ6VQAAACRo
+    aW9GSU8AJGhvc3RpbzAkaG9zdGlvMWFjOnUAAAAAYm9zczpVAABjZmc6dQAA
+    AGRzcDo6RFNQZnJkOnUAAABmczpVU0VSAGdzcDo6R3B1aGlkOlVTRVJodHRw
+    OkMAAG5kbTp1AAAAbndtOjpVRFNwdG06dQAAAHB4aTpkZXYAc29jOlUAAABz
+    c2w6QwAAAGxkcjpybwAAYW06c3lzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAD+//vw/7//8ec/APIA8JH/APaR/1D/gf9Y/4H/cP+B/3j/gf8B
+    AQD/AAIA/v//////////////////////////////////////////////////
+    ////////////////////////////////////////AAAAAAAAAAAAAAAAAAAA
+    AAQDAAAAAAAAAAAAAAAAAAI=
+  DisableDebug: false
+  EnableInterruptNumbers: []
+  EnableSystemCalls: 
+    ArbitrateAddress: 34
+    Break: 60
+    CancelTimer: 28
+    ClearEvent: 25
+    ClearTimer: 29
+    CloseHandle: 35
+    ConnectToPort: 45
+    ControlMemory: 1
+    CreateAddressArbiter: 33
+    CreateEvent: 23
+    CreateMemoryBlock: 30
+    CreateMutex: 19
+    CreateSemaphore: 21
+    CreateThread: 8
+    CreateTimer: 26
+    DuplicateHandle: 39
+    ExitProcess: 3
+    ExitThread: 9
+    GetCurrentProcessorNumber: 17
+    GetHandleInfo: 41
+    GetProcessAffinityMask: 4
+    GetProcessId: 53
+    GetProcessIdOfThread: 54
+    GetProcessIdealProcessor: 6
+    GetProcessInfo: 43
+    GetResourceLimit: 56
+    GetResourceLimitCurrentValues: 58
+    GetResourceLimitLimitValues: 57
+    GetSystemInfo: 42
+    GetSystemTick: 40
+    GetThreadAffinityMask: 13
+    GetThreadContext: 59
+    GetThreadId: 55
+    GetThreadIdealProcessor: 15
+    GetThreadInfo: 44
+    GetThreadPriority: 11
+    MapMemoryBlock: 31
+    OutputDebugString: 61
+    QueryMemory: 2
+    ReleaseMutex: 20
+    ReleaseSemaphore: 22
+    SendSyncRequest1: 46
+    SendSyncRequest2: 47
+    SendSyncRequest3: 48
+    SendSyncRequest4: 49
+    SendSyncRequest: 50
+    SetProcessAffinityMask: 5
+    SetProcessIdealProcessor: 7
+    SetThreadAffinityMask: 14
+    SetThreadIdealProcessor: 16
+    SetThreadPriority: 12
+    SetTimer: 27
+    SignalEvent: 24
+    SleepThread: 10
+    UnmapMemoryBlock: 32
+    WaitSynchronization1: 36
+    WaitSynchronizationN: 37
+  FileSystemAccess: 
+   - Debug
+   - DirectSdmc
+   - DirectSdmcWrite
+   - Core
+  HandleTableSize: 512
+  IORegisterMapping: 
+   - 1ff50000-1ff57fff
+   - 1ff70000-1ff77fff
+  IdealProcessor: 1
+  IoAccessControl: 
+   - UseDirectSdmc
+   - SdApplication
+   - FsMountTwln
+  MemoryMapping: 
+   - 1f000000-1f5fffff:r
+  MemoryType: Application
+  Priority: 24
+  ProgramId: 0x00040000ffffff00L
+  ServiceAccessControl: 
+   - APT:U
+   - $hioFIO
+   - $hostio0
+   - $hostio1
+   - ac:u
+   - boss:U
+   - cfg:u
+   - dsp::DSP
+   - frd:u
+   - fs:USER
+   - gsp::Gpu
+   - hid:USER
+   - http:C
+   - ndm:u
+   - nwm::UDS
+   - ptm:u
+   - pxi:dev
+   - soc:U
+   - ssl:C
+   - ldr:ro
+   - am:sys
+  Signature: |
+    df8WcNTaVgoVquQ9BkEsZoF3PpbJVmH6XIv6V9KHR/rJNpR/QcT2k/psvUNf
+    tlgvSy+ZtRIUE+xM0qelRXXZ/kpUUtPuYF0//cdetGKJIXVzV/0CLsChV1LQ
+    ZKDZasONA2of0sBQmyh82GWbIvwKuaQjkTcEpZ0xSO8qMRIFsE9T1itpZI3y
+    39KZSBz5FNGizpA2UoFKCART2VDvx1owquaB6FaUjUEljRYF2B5xfzImsWtR
+    CMkbV7rSfKjCl1f2VLIPxc7GbOkY4/nYShaZgp9tvCFlBtUPLoec9TEr6Nn+
+    +r6Kh9BvXqPdd3rpDtHXim9CSWgXmZsNtIdoJ5rS7g==
+  StorageId: 
+   - 0
+CommonHeaderKey: 
+  D: |
+    2dZqKOrq81unaSIjE7BboKKaCHaNsjpoZcjSnwX3x8NMSHC2ovTPP3iR+6Qz
+    Rq15iPQg2NV/4WbMMmKFNfVIrsNEAbpOFpQCXdriiwsXHMziM1wO7Td4qzYN
+    z/s6ZNxhTxpdKtISUDmkyLGVFBCGNV4EPJkEM+GWqn5yKw1uX0lt2x/iICGR
+    WE8f02khCCpAD1/CrrSaUHBrodE9lXX0lGT8rYEB7avrl99FNFcxa8NUslqN
+    0lcP9yzzssJNQitYiZv5VLkJgAt4RCadsZd5sWblqGTFK/zEd7wN4BXs87tR
+    RLDWMAeJ3L/e4ZRpenon/vit1o9UmSgSGKb9klejAQ==
+  DP: |
+    xRNzBAhcOLE51pbYrWt4xBMokTuY/NhJN6IoN+r8dg3jIwBq4H9PtlV+gyqU
+    4mTptKZiNyZa8uvUt0TlB/BgFiwc7MWkFTcJ+TBB1orXC38bTTBLGP1J7B/S
+    MEPveiQjjUHRaBFjS+5BMfcXeOcQ9/FOt1FiuHcvDKWKD85tgYE=
+  DQ: |
+    euNxPVbXvF/a9HPArd3Fd8BUcm4Fb0Q18W0SYqHdDD4mP7lWjTKHGADix1OX
+    UtqNPyv6NbJ5WnwKg4oqB9zl4Dxu6JyrifBiZ2VxngrLLA0xRKYjxNxMIAgx
+    7PbgQcZ5x45fgNa1QFA31oQnaa2Mvr4PgHqMlK6VIFqEg+ZA/+c=
+  Exponent: |
+    AQAB
+  InverseQ: |
+    5WZLcyBu4+Mq8aTpVybYh1boPuVyMSvBeCvkedKssUvG8PFhx5Z5vMkvjgpo
+    ckM/etwsOwSLGuDzzUhMFflM1koSi+dwyR0FpRAkTnXeY12xgwbVaiMJot0v
+    e37qFGCMYiDQXu4wjbiR2IJ6YRmSSy3RyBHiMw++y/6vKKQ1jPI=
+  Modulus: |
+    5OQ4q7/KRkL+yc/QrOysdG0wKlwgzj0VlwfdnvEBfBSjG6bAALQkqWVzUXkk
+    JaHcun6evvaHq7Tc9Aa6xNMgA7oBsfGVpneGMFrjvJzDqi9gjZQUdirfyIDR
+    Hp+F/A4DXQ3CUufnUTv2F+W5ACNOpe8QR9UOBjrJGYzmFS1VvF2wNqy5cNhg
+    CH4lK6fmetKCJn60EWzPahvLPRJbWITvtmky21GQ0JOU87I8n4r288JTVKEW
+    FDtku26iWW67erVUpn21KQvimhWjiuKAjAWEzt97np0GdxNs8fSWq57jTwuT
+    eyEZayHXbHsjp8hNU11aML7mM5IYgRRZGFV3OU+ufw==
+  P: |
+    /B+LD7VSdc2FL61myP2m92eBsOdxzMtb7egh3zGnnRDbUxKE7o97imkL+gx5
+    MtdXvWWZSKnB9dbmkcSxpaLuV6cvHmBPxUmn2W6nlRT025c2F4Zti+fJrUEE
+    GSMKH/Xp+qE5o03+geWPYffFjUugxGJMrmKYpVGxYdRWYSY5xKE=
+  Q: |
+    6Gk6mKRG6huUf7xPHhuFYNdzigZO1Z15XfRmcrNaHwlVhkPofzEQDpj8mI4g
+    RaJIVi1a147vK8B5gcgeGNQ2Ukyhw9j+tjDN9nB9b7mAnZ97+9Q9R5A/rtQF
+    kGFga2AwkNsT2/cXX9HYBi0IqhFoe+URHvJc8ba23O3EQLSlfx8=
+DefaultSpec: 
+  AccessControlInfo: 
+    AffinityMask: 1
+    FirmwareVersion: 2
+    HandleTableSize: 512
+    IORegisterMapping: 
+     - 1ff50000-1ff57fff
+     - 1ff70000-1ff77fff
+    IdealProcessor: 0
+    MemoryMapping: 
+     - 1f000000-1f5fffff:r
+    Priority: 16
+  BasicInfo: 
+    CompanyCode: "00"
+    Logo: Nintendo
+    Title: default
+  ExeFs: 
+    ReadOnly: 
+     - RO
+    ReadWrite: 
+     - RW
+    Text: 
+     - STUP_ENTRY
+  Media: 
+    MediaType: Card
+  PlainRegion: 
+   - .module_id
+  Rom: 
+    DefaultReject: 
+     - .*
+    File: 
+     - "*"
+  SystemControlInfo: 
+    Dependency: 
+      ac: 0x0004013000002402L
+      am: 0x0004013000001502L
+      boss: 0x0004013000003402L
+      camera: 0x0004013000001602L
+      cecd: 0x0004013000002602L
+      cfg: 0x0004013000001702L
+      codec: 0x0004013000001802L
+      csnd: 0x0004013000002702L
+      dlp: 0x0004013000002802L
+      dsp: 0x0004013000001a02L
+      friends: 0x0004013000003202L
+      gpio: 0x0004013000001b02L
+      gsp: 0x0004013000001c02L
+      hid: 0x0004013000001d02L
+      http: 0x0004013000002902L
+      i2c: 0x0004013000001e02L
+      mcu: 0x0004013000001f02L
+      mic: 0x0004013000002002L
+      ndm: 0x0004013000002b02L
+      news: 0x0004013000003502L
+      nim: 0x0004013000002c02L
+      nwm: 0x0004013000002d02L
+      pdn: 0x0004013000002102L
+      ps: 0x0004013000003102L
+      ptm: 0x0004013000002202L
+      ro: 0x0004013000003702L
+      socket: 0x0004013000002e02L
+      spi: 0x0004013000002302L
+      ssl: 0x0004013000002f02L
+    StackSize: 16384

trunk/KENJEraser/OMakefile

@@ -59,7 +59,7 @@ LIBS               +=   libnn_cfg \
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
+DESCRIPTOR          =   DSiWareDeleteTool.desc
 
 include $(ROOT_OMAKE)/modulerules
 

trunk/KENJEraser/main.cpp

@@ -15,7 +15,7 @@
 
 #include <nn.h>
 #include <nn/fnd.h>
-#include <nn/am/am_ApiLocalImporter.h>
+#include <nn/am/am_LocalImportControl.h>
 #include <nn/am/am_ApiSystemMenu.h>
 #include <nn/am/am_Result.h>
 #include <nn/cfg/CTR/cfg_Api.h>
@@ -208,7 +208,7 @@ namespace {
             }
             
             // ほぼ日健康手帳を消す
-            result = nn::am::DeleteProgram(nn::fs::MEDIA_TYPE_NAND, NAND_TWL_KENJ_PROGRAM_ID);
+            result = nn::am::DeleteUserProgram(nn::fs::MEDIA_TYPE_NAND, NAND_TWL_KENJ_PROGRAM_ID);
             UTIL_RETURN_IF_NOT_AM_NOT_FOUND(result);
         }
         
@@ -272,10 +272,10 @@ extern "C" void nnMain(void)
     NN_UTIL_PANIC_IF_FAILED(result);
 
     // cfg の初期化
-    nn::cfg::CTR::init::Initialize();
+    nn::cfg::CTR::Initialize();
 
     // am の初期化
-    nn::am::InitializeForLocalImporter();
+    nn::am::InitializeForSystemMenu();
 
     // ヒープの確保
     common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);