From de0a3b4c83151b420e550947610e84c987484d87 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 5 Mar 2009 02:20:40 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:MRC=E6=A9=9F=E8=83=BD=E3=81=AE=E3=82=A2?= =?UTF-8?q?=E3=82=AF=E3=82=BB=E3=82=B9=E3=82=B3=E3=83=B3=E3=83=88=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E6=83=85=E5=A0=B1=E3=81=AE=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@205 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11488256 -> 11488256 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 73216 -> 73216 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 13680 -> 22906 bytes .../MasterEditorTWL/srl_mrc.cpp | 16 ++++++++-------- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 77aeb0c9f29c7a2be0d1bf27368ccf7f97bce4fc..ea947e6684ad7e485dd8017bbda82e78231ccb30 100644 GIT binary patch delta 4925 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 J&A~spmVd~$)qwy2 delta 576 zcmXAmUuaTs6vywmUhmYoo8H~bOvacLVUA_3h&9om0vEJ3>ZONrxCVt#nvp?&ZhIMt zE4W9x>(4{kVp4fxaM`YN9_S04L^*F$cBb&R)H{fgms~&Vi4<(Of zc;GO&zX1}C=s#)ogwu*jbVc{MnIet-z@aG<9HO--@W@AHlE-X3Gc4+hBDjsaSzH~V zYe{=nL{rg0^XIM$;Qh~aK7*YDE^wefTSe(?Cyweh>P+|mv#DYsxldWYjYn^>Kw81+ zdI#*pc)E(QpbP@V(?$RVq2qBb!(-QjQ+P7%!cgEieYkCdLbn89V#vR6?_1ftjdA?p zqFf)&gxj^}HoUskL|(1NHzRuQI;l5n1yZ*wfDv853sWf?)vW+l7VsT?jV`L)bBfw< zO(TWjRdP8SjxQ_Ff&oth49yDa6;ThkKrwKfm+WK*EjCX1*;%12XnE8hv;c$P`tIWa z`$n30am^wOS8hy@=}leMUpXOyk*^UfeN=NZpp`?cbLdIwvxHAQlQ{W_Fdn{yr6m#b cXGFUBZB4>Z<+7PO%uW(}I{L#ZslQdvKOdCTZU6uP diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 98364d5d79763b3c506deb818a6dda7528336bf8..174db68b8812db5f54f72f06101ee7185177688c 100644 GIT binary patch delta 2185 zcmcIlTWB0*6h4#0ZQW*<%w$87=CYFsNfT`+XLD(4ErPTatC&bd<0TTZn@dw-vhGHc zVsR;g&{8bT5g&vE3L+wimuW$ZR(z4Z2r6FiMeTzRR>X=gDn9uA|8$d?-H4?ShPnO! zch33d{NMl0wWEK(XS}l~Vx}lXci`BK`v9&i$;5znJo54ui8!sY8t*dml%-jkp#>Vl zIZhKY7QbDxZQCUs@A7Km_f?7=OGtBz8c2ALoBc+4T5rY58)ol+R6AZ_WW2w&-dVLR zj}j9oGDS-$Q}1Uh4_mRGl&>mlF=4V?Xhjx-9CmMFizUHm+d2?%}F*p~>BR^P8#eNl3FM@rV zKtCL;?ZY%ghiE?y(*ZiDYNLn#+(t7~=z;^}B&E^cX<*0E&FtDYs(1%)qk-`ZMjY>o z)nk}_rAqLUiIca;8+Dhx?DkX94d!p{fPnf-!ywl_xzrhvSL?o!tQD_B59Hn2w%TH^ z1AUNBw$({%ERyU&2lj&b9K~=%!F>U5N)5A0A@XhKA+cgstVfTgah;&Oa;2q3UTUzR zhiYBryXGB+Eg!chjd5?$tlx;-iq+(GcH72sqQ)HfU+R#-4N_NvxmoI}N*VQXazX0K z97;{1&%4xlSA|(V)JU5sg|G{7IYy1oE8gc=1r&w7)c#P|Fe|HJRI zO;`CNJbl2+EK6={jG^MSA$hvvH{}u7LCSH|F1G1@KFM#LD)5JA3j91j#ucoX6=Q7r zn$PL7%lzlm13(E+^8t<2G?2lj(@(rOG=i}a9=jgjOKOAc304O=N9%S}p6mFj5cHOH z7uqa7eZ)9QdJ*Cf^svqBj8bCCXA<#ON-ax>O3(&3lS*-sm)VnJZj1Crt%6NmbeOt9 za0I`WIT*)0EkZ2oyabFA9M13_W0?%sabG1ia s#Rhs?PPldV7C+mj3;Zen40T_|b{QS6NssVUNZa9^P>S}xjn9jDvW=Ms#(P z>t$m%f3Ox~E?5)A*_?-xY#CJupXKGPlRXk8U=;T5;`$l=&CojniVth zJ7E}Myg9dCy^-%;GCI`I?Ue>nnrL2J0s)dWmlS5Yoj00OTP<&Hw-a diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index f0e7bbf..9f88ba2 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -593,14 +593,14 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hWarnList->Add( this->makeMrcError("GameCardNTRAccessSystem") ); } + if( this->pRomHeader->s.access_control.hw_aes_slot_A_SSLClientCert != 0 ) + { + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "HW AES Slot A for the SSL client certification") ); + } if( !this->IsMediaNand && this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0 ) { this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "HW AES SlotB (JPEG signature) for the user") ); } - if( this->pRomHeader->s.access_control.hw_aes_slot_A_SSLClientCert ) - { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "HW AES Slot A for the SSL client certification") ); - } if( this->pRomHeader->s.access_control.common_client_key_for_debugger_sysmenu != 0 ) { this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Common Client Key for the debugger system menu") ); @@ -648,14 +648,14 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hErrorList->Add( this->makeMrcError("GameCardNTRAccessUser") ); } + if( this->pRomHeader->s.access_control.hw_aes_slot_A_SSLClientCert != 0 ) + { + this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "HW AES Slot A for the SSL client certification") ); + } if( !this->IsMediaNand && this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0 ) { this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "HW AES SlotB (JPEG signature) for the user") ); } - if( this->pRomHeader->s.access_control.hw_aes_slot_A_SSLClientCert ) - { - this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "HW AES Slot A for the SSL client certification") ); - } if( this->pRomHeader->s.access_control.common_client_key_for_debugger_sysmenu != 0 ) { this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "Common Client Key for the debugger system menu") );