mirror of
https://github.com/martravi/wiiqt.git
synced 2024-11-22 09:09:18 +01:00
* Tmd class: change name of bootindex/index to match libogc and avoid confusion
* nandChecker: add korean brick checking ( still untested with a real korean dump )
This commit is contained in:
giantpune@gmail.com
parent
14f32c8fd6
commit
1ee50ec16f
@ -713,6 +713,48 @@ bool NandBin::GetKey( int type )
|
||||
return true;
|
||||
}
|
||||
|
||||
const QByteArray NandBin::Keys()
|
||||
{
|
||||
QByteArray ret;
|
||||
switch( type )
|
||||
{
|
||||
case 0:
|
||||
case 1:
|
||||
{
|
||||
QString keyPath = nandPath;
|
||||
int sl = keyPath.lastIndexOf( "/" );
|
||||
if( sl == -1 )
|
||||
{
|
||||
emit SendError( tr( "Error getting path of keys.bin" ) );
|
||||
return false;
|
||||
}
|
||||
keyPath.resize( sl + 1 );
|
||||
keyPath += "keys.bin";
|
||||
|
||||
ret = ReadFile( keyPath );
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
{
|
||||
if( !f.isOpen() )
|
||||
{
|
||||
emit SendError( tr( "Tried to read keys from unopened file" ) );
|
||||
return false;
|
||||
}
|
||||
f.seek( 0x21000000 );
|
||||
ret = f.read( 0x400 );
|
||||
}
|
||||
break;
|
||||
default:
|
||||
emit SendError( tr( "Tried to read keys for unknown dump type" ) );
|
||||
return QByteArray();
|
||||
break;
|
||||
}
|
||||
if( ret.size() != 0x400 )
|
||||
return QByteArray();
|
||||
return ret;
|
||||
}
|
||||
|
||||
const QByteArray NandBin::ReadKeyfile( const QString &path, quint8 type )
|
||||
{
|
||||
QByteArray retval;
|
||||
|
||||
@ -142,6 +142,9 @@ public:
|
||||
//get the path of this nand
|
||||
const QString FilePath();
|
||||
|
||||
//get the keys.bin for this object
|
||||
const QByteArray Keys();
|
||||
|
||||
|
||||
private:
|
||||
QByteArray key;
|
||||
|
||||
@ -162,13 +162,20 @@ bool Tmd::SetSize( quint16 cid, quint32 size )
|
||||
return true;
|
||||
}
|
||||
|
||||
quint16 Tmd::BootIndex( quint16 i )
|
||||
quint16 Tmd::Index( quint16 i )
|
||||
{
|
||||
if( !p_tmd || i > qFromBigEndian( p_tmd->num_contents ) )
|
||||
return 0;
|
||||
return qFromBigEndian( p_tmd->contents[ i ].index );
|
||||
}
|
||||
|
||||
quint16 Tmd::BootIndex()
|
||||
{
|
||||
if( !p_tmd )
|
||||
return 0;
|
||||
return qFromBigEndian( p_tmd->boot_index );
|
||||
}
|
||||
|
||||
quint16 Tmd::Type( quint16 i )
|
||||
{
|
||||
if( !p_tmd || i > qFromBigEndian( p_tmd->num_contents ) )
|
||||
|
||||
@ -186,7 +186,8 @@ public:
|
||||
//returned in host endian
|
||||
quint64 Size( quint16 i );
|
||||
quint16 Type( quint16 i );
|
||||
quint16 BootIndex( quint16 i );
|
||||
quint16 BootIndex();
|
||||
quint16 Index( quint16 i );
|
||||
quint64 Tid();
|
||||
quint64 IOS();
|
||||
quint16 Gid();
|
||||
|
||||
@ -22,6 +22,8 @@
|
||||
#define NAND_ATTR_OTHER( attr ) ( ( attr >> 2 ) & 3 )
|
||||
|
||||
#define COMMON_KEY { 0xeb, 0xe4, 0x2a, 0x22, 0x5e, 0x85, 0x93, 0xe4, 0x48, 0xd9, 0xc5, 0x45, 0x73, 0x81, 0xaa, 0xf7 }
|
||||
#define KOREAN_KEY { 0x63, 0xb8, 0x2b, 0xb4, 0xf4, 0x61, 0x4e, 0x2e, 0x13, 0xf2, 0xfe, 0xfb, 0xba, 0x4c, 0x9b, 0x7e }
|
||||
|
||||
|
||||
#define SD_KEY { 0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08, 0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d };
|
||||
#define SD_IV { 0x21, 0x67, 0x12, 0xe6, 0xaa, 0x1f, 0x68, 0x9f, 0x95, 0xc5, 0xa2, 0x23, 0x24, 0xdc, 0x6a, 0x98 };
|
||||
|
||||
@ -121,7 +121,7 @@ Wad::Wad( const QByteArray &stuff )
|
||||
//is using the AES that would change the key on us
|
||||
AesSetKey( ticket.DecryptedKey() );
|
||||
|
||||
QByteArray decData = AesDecrypt( t.BootIndex( i ), encData );
|
||||
QByteArray decData = AesDecrypt( t.Index( i ), encData );
|
||||
decData.resize( t.Size( i ) );
|
||||
QByteArray realHash = GetSha1( decData );
|
||||
if( realHash != t.Hash( i ) )
|
||||
@ -171,7 +171,7 @@ Wad::Wad( const QList< QByteArray > &stuff, bool encrypted )
|
||||
QByteArray decDataPadded = PaddedByteArray( stuff.at( i + 2 ), 0x40 );
|
||||
//doing this here in case there is some other object that is using the AES that would change the key on us
|
||||
AesSetKey( ticket.DecryptedKey() );
|
||||
encData = AesEncrypt( t.BootIndex( i ), decDataPadded );
|
||||
encData = AesEncrypt( t.Index( i ), decDataPadded );
|
||||
}
|
||||
partsEnc << encData;
|
||||
}
|
||||
@ -233,7 +233,7 @@ Wad::Wad( QDir dir )
|
||||
}
|
||||
AesSetKey( ticket.DecryptedKey() );
|
||||
appD = PaddedByteArray( appD, 0x40 );
|
||||
QByteArray encData = AesEncrypt( t.BootIndex( i ), appD );
|
||||
QByteArray encData = AesEncrypt( t.Index( i ), appD );
|
||||
partsEnc << encData;
|
||||
}
|
||||
//if something in the tmd changed, fakesign it
|
||||
@ -311,7 +311,7 @@ const QByteArray Wad::Content( quint16 i )
|
||||
|
||||
AesSetKey( ticket.DecryptedKey() );
|
||||
|
||||
QByteArray decData = AesDecrypt( t.BootIndex( i ), encData );
|
||||
QByteArray decData = AesDecrypt( t.Index( i ), encData );
|
||||
decData.resize( t.Size( i ) );
|
||||
QByteArray realHash = GetSha1( decData );
|
||||
if( realHash != t.Hash( i ) )
|
||||
@ -809,7 +809,7 @@ bool Wad::ReplaceContent( quint16 idx, const QByteArray &ba )
|
||||
AesSetKey( ti.DecryptedKey() );
|
||||
QByteArray decDataPadded = PaddedByteArray( ba, 0x40 );
|
||||
|
||||
QByteArray encData = AesEncrypt( t.BootIndex( idx ), decDataPadded );
|
||||
QByteArray encData = AesEncrypt( t.Index( idx ), decDataPadded );
|
||||
partsEnc.replace( idx, encData );
|
||||
|
||||
return true;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include "../WiiQt/tiktmd.h"
|
||||
#include "../WiiQt/settingtxtdialog.h"
|
||||
#include "../WiiQt/u8.h"
|
||||
|
||||
#include "../WiiQt/keysbin.h"
|
||||
|
||||
//yippie for global variables
|
||||
QStringList args;
|
||||
@ -20,10 +20,15 @@ QList<quint16> fats;
|
||||
quint32 verbose = 0;
|
||||
bool tryToKeepGoing = false;
|
||||
bool color = true;
|
||||
bool calcRsa = false;
|
||||
QByteArray sysMenuResource;
|
||||
QByteArray sysMenuExe;
|
||||
quint64 sysMenuIos;
|
||||
|
||||
bool CheckTitleIntegrity( quint64 tid );
|
||||
|
||||
#ifdef Q_WS_WIN
|
||||
#include <windows.h> // WinApi header
|
||||
#include <windows.h>
|
||||
#define C_STICKY 31
|
||||
#define C_CAP 192
|
||||
|
||||
@ -102,8 +107,12 @@ void PrintColoredString( const char *msg, int highlite )
|
||||
}
|
||||
else
|
||||
{
|
||||
QString m( msg );
|
||||
QString m2 = m.trimmed();
|
||||
QString str( msg );
|
||||
QStringList list = str.split( "\n", QString::SkipEmptyParts );
|
||||
foreach( QString s, list )
|
||||
{
|
||||
QString m = s;
|
||||
QString m2 = s.trimmed();
|
||||
m.resize( m.indexOf( m2 ) );
|
||||
printf( "%s", m.toLatin1().data() ); //print all leading whitespace
|
||||
#ifdef Q_WS_WIN
|
||||
@ -123,6 +132,7 @@ void PrintColoredString( const char *msg, int highlite )
|
||||
#endif
|
||||
printf( "\n" );
|
||||
}
|
||||
}
|
||||
fflush( stdout );
|
||||
}
|
||||
|
||||
@ -147,8 +157,6 @@ void DebugHandler( QtMsgType type, const char *msg )
|
||||
}
|
||||
}
|
||||
|
||||
bool CheckTitleIntegrity( quint64 tid );
|
||||
|
||||
void Usage()
|
||||
{
|
||||
qWarning() << "usage:" << QCoreApplication::arguments().at( 0 ) << "nand.bin" << "<other options>";
|
||||
@ -157,13 +165,15 @@ void Usage()
|
||||
qDebug() << "";
|
||||
qDebug() << " -fs verify the filesystem is in tact";
|
||||
qDebug() << " verifies presence of uid & content.map & checks the hashes in the content.map";
|
||||
qDebug() << " check all titles with a ticket for RSA & sha1 validity";
|
||||
qDebug() << " check sha1 hashes for title private contents";
|
||||
qDebug() << " check all titles with a ticket titles for required IOS, proper uid & gid";
|
||||
qDebug() << "";
|
||||
qDebug() << " -settingtxt check setting.txt itself and against system menu resources. this must be combined with \"-fs\"";
|
||||
qDebug() << "";
|
||||
qDebug() << " -uid Look any titles in the uid.sys, check signatures and whatnot. this must be combined with \"-fs\"";
|
||||
qDebug() << "";
|
||||
qDebug() << " -rsa Calculate and compare RSA signatures. this must be combined with \"-fs\"";
|
||||
qDebug() << "";
|
||||
qDebug() << " -clInfo shows free, used, and lost ( marked used, but dont belong to any file ) clusters";
|
||||
qDebug() << "";
|
||||
qDebug() << " -spare calculate & compare ecc for all pages in the nand";
|
||||
@ -176,6 +186,20 @@ void Usage()
|
||||
qDebug() << " -continue try to keep going as fas as possible on errors that should be fatal";
|
||||
qDebug() << "";
|
||||
qDebug() << " -nocolor don\'t use terminal color trickery";
|
||||
qDebug() << "";
|
||||
qDebug() << " -about info about this program";
|
||||
exit( 1 );
|
||||
}
|
||||
|
||||
void About()
|
||||
{
|
||||
qCritical() << " (c) giantpune 2010, 2011";
|
||||
qCritical() << " http://code.google.com/p/wiiqt/";
|
||||
qCritical() << " built:" << __DATE__ << __TIME__;
|
||||
qWarning() << "This software is licensed under GPLv2. It comes with no guarentee that it will work,";
|
||||
qWarning() << "or that it will work well.";
|
||||
qDebug() << "";
|
||||
qDebug() << "This program is designed to gather information about a nand dump for a Nintendo Wii";
|
||||
exit( 1 );
|
||||
}
|
||||
|
||||
@ -217,7 +241,7 @@ void ShowBootInfo( quint8 boot1, QList<Boot2Info> boot2stuff )
|
||||
qDebug() << "Boot1 D (fixed)";
|
||||
break;
|
||||
default:
|
||||
qDebug() << "unrecognized boot1 version";
|
||||
qWarning() << "unrecognized boot1 version";
|
||||
break;
|
||||
}
|
||||
quint16 cnt = boot2stuff.size();
|
||||
@ -367,10 +391,8 @@ QList< quint64 > InstalledTitles()
|
||||
{
|
||||
QTreeWidgetItem *tikI = subF->child( j );
|
||||
QString name = tikI->text( 0 );
|
||||
//qDebug() << "checking item" << subF->text( 0 ) + "/" + name;
|
||||
if( !name.endsWith( ".tik" ) )
|
||||
{
|
||||
//qDebug() << "!tik";
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -378,7 +400,6 @@ QList< quint64 > InstalledTitles()
|
||||
quint32 lower = name.toUInt( &ok, 16 );
|
||||
if( !ok )
|
||||
{
|
||||
//qDebug() << "!ok";
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -386,12 +407,10 @@ QList< quint64 > InstalledTitles()
|
||||
QTreeWidgetItem *tmdI = ItemFromPath( "/title/" + subF->text( 0 ) + "/" + name + "/content/title.tmd" );
|
||||
if( !tmdI )
|
||||
{
|
||||
//qDebug() << "no tmd";
|
||||
continue;
|
||||
}
|
||||
|
||||
quint64 tid = ( ( (quint64)upper << 32) | lower );
|
||||
//qDebug() << "adding item to list" << TidTxt( tid );
|
||||
ret << tid;
|
||||
}
|
||||
}
|
||||
@ -509,6 +528,115 @@ void PrintName( const QByteArray &app )
|
||||
qDebug() << "\tname: " << desc;
|
||||
}
|
||||
|
||||
bool CheckArm003( const QByteArray &stuff )
|
||||
{
|
||||
qint32 esTag = MAX( stuff.indexOf( "$IOSVersion: ES" ), stuff.indexOf( "$IOSVersion: ES" ) );
|
||||
if( esTag < 0 )
|
||||
{
|
||||
qWarning() << "\tFailed to find the ES module in the kernel";
|
||||
return false;
|
||||
}
|
||||
QByteArray start = stuff.left( esTag ); //drop the remaining modules
|
||||
qint32 prevTag = start.lastIndexOf( "$IOSVersion:", esTag - 1 );
|
||||
if( prevTag > 0 )
|
||||
start.remove( 0, prevTag );
|
||||
if( start.contains( QByteArray::fromHex( "e2511cb1d7fbbef8d7f97db5a1d81694" ) ) //1337 buffer #1
|
||||
|| start.contains( QByteArray::fromHex( "3f5b8cc9ea855a0afa7347d23e8d664e" ) ) //1337 buffer #2
|
||||
|| start.contains( QByteArray::fromHex( "b570b08868851c01310c22c0005218ab681b2b00d10248bff001f852680b2b45" ) ) )//blablabla, CMP R3, #0x45
|
||||
{
|
||||
if( verbose > 1 )
|
||||
qWarning() << "\tSystem menu IOS supports the Korean-key check";
|
||||
return true;
|
||||
}
|
||||
if( verbose > 1 )
|
||||
qDebug() << "\tSystem menu IOS does not appear to support the Korean-key check";
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
void Check003()
|
||||
{
|
||||
qDebug() << "Checking for 003 error ...";
|
||||
if( sysMenuExe.isEmpty() )
|
||||
{
|
||||
qWarning() << "can\'t check 003 error for empty data";
|
||||
return;
|
||||
}
|
||||
bool brick = true;
|
||||
|
||||
//check the PPC half
|
||||
if( !sysMenuExe.contains( "3880004538A0000038C00000" ) ) //li %r4, 0x45
|
||||
{ //li %r5, 0
|
||||
brick = false; //li %r6, 0
|
||||
if( verbose > 1 )
|
||||
qDebug() << "\tThe system menu doesn\'t appear to perform the Korean-key check";
|
||||
}
|
||||
else if( verbose > 1 )
|
||||
qWarning() << "\tThe system menu performs the Korean-key check";
|
||||
|
||||
//check the ARM half
|
||||
QString iosStr = TidTxt( sysMenuIos );
|
||||
iosStr.insert( 8, "/" );
|
||||
iosStr.prepend( "/title/" );
|
||||
iosStr += "/content/";
|
||||
QByteArray tmdD = nand.GetData( iosStr + "title.tmd" );
|
||||
if( tmdD.isEmpty() )
|
||||
{
|
||||
qWarning() << "\tcan\'t read systemmenu-ios's TMD";
|
||||
return;
|
||||
}
|
||||
Tmd t( tmdD );
|
||||
QByteArray iosKernel;
|
||||
QString kernelPath;
|
||||
quint16 cnt = t.Count();
|
||||
if( t.BootIndex() >= cnt ) //in case there is some really fucked up TMD
|
||||
{
|
||||
Fail( "\tThe system menu ios bootindex is fucked up pretty bad" );
|
||||
return;
|
||||
}
|
||||
if( t.Type( t.BootIndex() ) == 0x8001 )
|
||||
{
|
||||
QString appname = sharedM.GetAppFromHash( t.Hash( t.BootIndex() ) );
|
||||
if( appname.isEmpty() )
|
||||
{
|
||||
Fail( "\tError reading the system menu ios" );
|
||||
return;
|
||||
}
|
||||
|
||||
kernelPath = "/shared1/" + appname + ".app";
|
||||
}
|
||||
else
|
||||
{
|
||||
kernelPath = iosStr + t.Cid( t.BootIndex() ) + ".app";
|
||||
}
|
||||
iosKernel = nand.GetData( kernelPath );
|
||||
if( iosKernel.isEmpty() )
|
||||
{
|
||||
Fail( "\tError reading the system menu ios data" );
|
||||
return;
|
||||
}
|
||||
if( !CheckArm003( iosKernel ) )
|
||||
brick = false;
|
||||
|
||||
//look for korean keys in keys.bin
|
||||
QByteArray keys = nand.Keys();
|
||||
if( keys.size() != 0x400 )
|
||||
{
|
||||
Fail( "\tError getting nand keys" );
|
||||
return;
|
||||
}
|
||||
quint8 k_key[ 16 ] = KOREAN_KEY;
|
||||
if( !keys.contains( QByteArray( (const char*)&k_key, 16 ) ) )
|
||||
{
|
||||
brick = false;
|
||||
if( verbose > 1 )
|
||||
qDebug() << "\tThe korean key is not present in this wii";
|
||||
}
|
||||
if( brick )
|
||||
Fail( "\tThis wii will likely show the 003 error" );
|
||||
}
|
||||
|
||||
bool CheckTitleIntegrity( quint64 tid )
|
||||
{
|
||||
if( validIoses.contains( tid ) )//this one has already been checked
|
||||
@ -541,6 +669,8 @@ bool CheckTitleIntegrity( quint64 tid )
|
||||
qDebug() << "error getting" << it << "data";
|
||||
return false;
|
||||
}
|
||||
if( calcRsa )
|
||||
{
|
||||
qint32 ch = check_cert_chain( ba );
|
||||
switch( ch )
|
||||
{
|
||||
@ -559,6 +689,7 @@ bool CheckTitleIntegrity( quint64 tid )
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( i )
|
||||
{
|
||||
t = Tmd( ba );
|
||||
@ -616,20 +747,23 @@ bool CheckTitleIntegrity( quint64 tid )
|
||||
|
||||
//if we are going to check the setting.txt stuff, we need to get the system menu resource file to compare ( check for opera bricks )
|
||||
//so far, i think this file is always boot index 1, type 1
|
||||
if( tid == 0x100000002ull && t.BootIndex( i ) == 1 &&
|
||||
if( tid == 0x100000002ull )
|
||||
{
|
||||
if( t.Index( i ) == 1 &&
|
||||
( args.contains( "-settingtxt", Qt::CaseInsensitive ) || args.contains( "-all", Qt::CaseInsensitive ) ) )
|
||||
{
|
||||
sysMenuResource = ba;
|
||||
}
|
||||
else if( t.Index( i ) == t.BootIndex() )
|
||||
sysMenuExe = ba;
|
||||
}
|
||||
|
||||
//print a description of this title
|
||||
if( verbose > 1 && t.BootIndex( i ) == 0 )
|
||||
if( verbose > 1 && t.Index( i ) == 0 )
|
||||
{
|
||||
PrintName( ba );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
//print version
|
||||
@ -649,9 +783,11 @@ bool CheckTitleIntegrity( quint64 tid )
|
||||
qWarning() << "\tthe IOS for this title is not bootable\n\t" << TidTxt( ios ).insert( 8, "-" );
|
||||
return false;
|
||||
}
|
||||
if( tid == 0x100000002ull )
|
||||
sysMenuIos = ios;
|
||||
|
||||
if( verbose > 1 && upper != 1 )
|
||||
qDebug() << "\trequires IOS" << ((quint32)( ios & 0xffffffff ));// << TidTxt( ios ).insert( 8, "-" );
|
||||
if( verbose > 1 && ( upper != 1 || tid == 0x100000002ull ) )
|
||||
qDebug() << "\trequires IOS" << ((quint32)( ios & 0xffffffff ));
|
||||
quint32 uid = uidM.GetUid( tid, false );
|
||||
if( !uid )
|
||||
{
|
||||
@ -674,13 +810,6 @@ bool CheckTitleIntegrity( quint64 tid )
|
||||
qWarning() << "\tincorrect uid/gid for data folder";
|
||||
|
||||
RecurseCheckGidUid( dataI, uidS, gidS, "data/" );
|
||||
/*quint16 cnt = dataI->childCount();
|
||||
for( quint16 i = 0; i < cnt; i++ )
|
||||
{
|
||||
QTreeWidgetItem *item = dataI->child( i );
|
||||
if( item->text( 3 ) != uidS || !item->text( 4 ).startsWith( gidS ) )
|
||||
qDebug() << "\tincorrect uid/gid for" << QString( "data/" + item->text( 0 ) );
|
||||
}*/
|
||||
}
|
||||
dataP.resize( 25 );
|
||||
dataP += "content";
|
||||
@ -762,7 +891,7 @@ void ListDeletedTitles()
|
||||
qWarning() << "\tError reading TMD for" << qPrintable( TidTxt( tid ).insert( 8, "-" ) + ( upper != 1 ? " (" + AsciiTxt( lower ) + ")" : "" ) );
|
||||
deleted = true;
|
||||
}
|
||||
else
|
||||
else if( calcRsa )
|
||||
{
|
||||
qint32 ch = check_cert_chain( ba );
|
||||
switch( ch )
|
||||
@ -803,7 +932,7 @@ void ListDeletedTitles()
|
||||
qWarning() << "\tError reading ticket for" << qPrintable( TidTxt( tid ).insert( 8, "-" ) + ( upper != 1 ? " (" + AsciiTxt( lower ) + ")" : "" ) );
|
||||
deleted = true;
|
||||
}
|
||||
else
|
||||
else if( calcRsa )
|
||||
{
|
||||
qint32 ch = check_cert_chain( ba );
|
||||
switch( ch )
|
||||
@ -834,6 +963,7 @@ void ListDeletedTitles()
|
||||
void CheckLostClusters()
|
||||
{
|
||||
QList<quint16> u = nand.GetFatsForEntry( 0 );//all clusters actually used for a file
|
||||
if( verbose )
|
||||
qDebug() << "total used clusters" << hex << u.size() << "of 0x8000";
|
||||
quint16 lost = 0;
|
||||
QList<quint16> ffs;
|
||||
@ -876,7 +1006,6 @@ void CheckEcc()
|
||||
{
|
||||
if( fats.at( i ) == 0xfffd || fats.at( i ) == 0xfffe )
|
||||
continue;
|
||||
//qDebug() << hex << i;
|
||||
|
||||
for( quint8 j = 0; j < 8; j++, checked += 8 )
|
||||
{
|
||||
@ -897,23 +1026,16 @@ void CheckEcc()
|
||||
quint16 p = clustersCpy.takeFirst();
|
||||
if( fats.at( p ) < 0xfff0 )
|
||||
badClustersNotSpecial++;
|
||||
//qDebug() << p << hex << fats.at( p );
|
||||
|
||||
quint16 block = p/8;
|
||||
if( !blocks.contains( block ) )
|
||||
blocks << block;
|
||||
}
|
||||
/*QList< quint32 > badCpy = bad;
|
||||
while( badCpy.size() )
|
||||
{
|
||||
quint16 p = badCpy.takeFirst();
|
||||
quint16 block = p/64;
|
||||
if( !blocks.contains( block ) )
|
||||
blocks << block;
|
||||
}*/
|
||||
|
||||
qDebug() << bad.size() << "out of" << checked << "pages had incorrect ecc.\nthey were spread through"
|
||||
<< clusters.size() << "clusters in" << blocks.size() << "blocks:\n" << blocks;
|
||||
qDebug() << badClustersNotSpecial << "of those clusters are non-special (they belong to the fs)";
|
||||
//qDebug() << bad;
|
||||
|
||||
}
|
||||
|
||||
void SetUpTree()
|
||||
@ -1136,11 +1258,17 @@ int main( int argc, char *argv[] )
|
||||
hConsole = GetStdHandle( STD_OUTPUT_HANDLE );
|
||||
#endif
|
||||
qInstallMsgHandler( DebugHandler );
|
||||
qCritical() << "** nandBinCheck : Wii nand info tool **";
|
||||
qCritical() << " from giantpune";
|
||||
qCritical() << " built:" << __DATE__ << __TIME__;
|
||||
args = QCoreApplication::arguments();
|
||||
|
||||
if( args.contains( "-nocolor", Qt::CaseInsensitive ) )
|
||||
color = false;
|
||||
|
||||
if( args.contains( "-about", Qt::CaseInsensitive ) )
|
||||
About();
|
||||
|
||||
if( args.size() < 3 )
|
||||
Usage();
|
||||
|
||||
@ -1157,6 +1285,9 @@ int main( int argc, char *argv[] )
|
||||
if( args.contains( "-continue", Qt::CaseInsensitive ) )
|
||||
tryToKeepGoing = true;
|
||||
|
||||
if( args.contains( "-rsa", Qt::CaseInsensitive ) || args.contains( "-all", Qt::CaseInsensitive ) )
|
||||
calcRsa = true;
|
||||
|
||||
//these only serve to show info. no action is taken
|
||||
if( args.contains( "-boot", Qt::CaseInsensitive ) || args.contains( "-all", Qt::CaseInsensitive ) )
|
||||
{
|
||||
@ -1189,6 +1320,7 @@ int main( int argc, char *argv[] )
|
||||
//if( !CheckTitleIntegrity( tid ) && tid == 0x100000002ull ) //well, this SHOULD be the case. but nintendo doesnt care so much about
|
||||
//Fail( "The System menu isnt valid" ); //checking signatures & hashes as the rest of us.
|
||||
}
|
||||
Check003();
|
||||
if( args.contains( "-settingtxt", Qt::CaseInsensitive ) || args.contains( "-all", Qt::CaseInsensitive ) )
|
||||
{
|
||||
CheckSettingTxt();
|
||||
|
||||
@ -971,13 +971,13 @@ void MainWindow::on_actionFormat_triggered()
|
||||
shared = SharedContentMap();
|
||||
if( !nand.CreateEntry( "/sys/uid.sys", 0, 0, NAND_FILE, NAND_RW, NAND_RW, 0 ) )
|
||||
{
|
||||
ShowMessage( "<b>Error! Can't /sys/uid.sys</b>" );
|
||||
ShowMessage( "<b>Error! Can't create /sys/uid.sys</b>" );
|
||||
return;
|
||||
}
|
||||
//clear content.map
|
||||
if( !nand.CreateEntry( "/shared1/content.map", 0, 0, NAND_FILE, NAND_RW, NAND_RW, 0 ) )
|
||||
{
|
||||
ShowMessage( "<b>Error! Can't /shared1/content.map</b>" );
|
||||
ShowMessage( "<b>Error! Can't create /shared1/content.map</b>" );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user