The-Homebrew-Cloud/JNUSLib
2
0
Fork 0
mirror of https://github.com/Maschell/JNUSLib.git synced 2024-11-22 16:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix non-gm parition with FST > 0x8000 bytes.

Browse Source 
- Wrap reading from discReader in WUDInfoParser.
- Only save the complete WUDPartitionHeader in the game partition
- Replace the WUDPartitio.getAbsolutePartitionOffset by getPartitionOffset.
This commit is contained in:
Maschell 2019-04-14 22:09:15 +02:00
parent 54536f29ab
commit a521b045ab
5 changed files with 79 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/de/mas/wiiu/jnus/implementations/FSTDataProviderWUDDataPartition.java
View File

@ -56,9 +56,9 @@ public class FSTDataProviderWUDDataPartition implements FSTDataProvider {
public byte[] getChunkOfData(long contentOffset, long fileoffset, long size, WUDDiscReader discReader, byte[] titleKey) throws IOException { public byte[] getChunkOfData(long contentOffset, long fileoffset, long size, WUDDiscReader discReader, byte[] titleKey) throws IOException {
if (titleKey == null) { if (titleKey == null) {
return discReader.readEncryptedToByteArray(partition.getAbsolutePartitionOffset() + contentOffset, fileoffset, (int) size); return discReader.readEncryptedToByteArray(partition.getPartitionOffset() + contentOffset, fileoffset, (int) size);
} }
return discReader.readDecryptedToByteArray(partition.getAbsolutePartitionOffset() + contentOffset, fileoffset, (int) size, titleKey, null, false); return discReader.readDecryptedToByteArray(partition.getPartitionOffset() + contentOffset, fileoffset, (int) size, titleKey, null, false);
} }
@Override @Override
@ -66,9 +66,9 @@ public class FSTDataProviderWUDDataPartition implements FSTDataProvider {
ContentFSTInfo info = partition.getFST().getContentFSTInfos().get((int) entry.getContentFSTID()); ContentFSTInfo info = partition.getFST().getContentFSTInfos().get((int) entry.getContentFSTID());
long usedSize = size.orElse(entry.getFileSize()); long usedSize = size.orElse(entry.getFileSize());
if (titleKey == null) { if (titleKey == null) {
discReader.readEncryptedToStream(out, partition.getAbsolutePartitionOffset() + info.getOffset() + entry.getFileOffset() + offset, usedSize); discReader.readEncryptedToStream(out, partition.getPartitionOffset() + info.getOffset() + entry.getFileOffset() + offset, usedSize);
} }
discReader.readDecryptedToOutputStream(out, partition.getAbsolutePartitionOffset() + info.getOffset(), entry.getFileOffset() + offset, usedSize, discReader.readDecryptedToOutputStream(out, partition.getPartitionOffset() + info.getOffset(), entry.getFileOffset() + offset, usedSize,
titleKey, null, false); titleKey, null, false);
} }
@ -77,7 +77,7 @@ public class FSTDataProviderWUDDataPartition implements FSTDataProvider {
if (titleKey == null) { if (titleKey == null) {
ContentFSTInfo info = partition.getFST().getContentFSTInfos().get((int) entry.getContentFSTID()); ContentFSTInfo info = partition.getFST().getContentFSTInfos().get((int) entry.getContentFSTID());
long usedSize = size.orElse(entry.getFileSize()); long usedSize = size.orElse(entry.getFileSize());
return discReader.readEncryptedToStream(partition.getAbsolutePartitionOffset() + info.getOffset() + entry.getFileOffset() + offset, usedSize); return discReader.readEncryptedToStream(partition.getPartitionOffset() + info.getOffset() + entry.getFileOffset() + offset, usedSize);
} }
return FSTDataProvider.super.readFileAsStream(entry, offset, size); return FSTDataProvider.super.readFileAsStream(entry, offset, size);

4
src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUD.java
View File

@ -40,9 +40,9 @@ public class NUSDataProviderWUD implements NUSDataProvider {
public long getOffsetInWUD(Content content) { public long getOffsetInWUD(Content content) {
if (content.getIndex() == 0) { // Index 0 is the FST which is at the beginning of the partion; if (content.getIndex() == 0) { // Index 0 is the FST which is at the beginning of the partion;
return getGamePartition().getAbsolutePartitionOffset(); return getGamePartition().getPartitionOffset();
} }
return getGamePartition().getAbsolutePartitionOffset() + content.getContentFSTInfo().getOffset(); return getGamePartition().getPartitionOffset() + content.getContentFSTInfo().getOffset();
} }
@Override @Override

7
src/de/mas/wiiu/jnus/implementations/wud/parser/WUDGamePartition.java
View File

@ -25,13 +25,18 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WUDGamePartition extends WUDPartition { public class WUDGamePartition extends WUDPartition {
private final WUDPartitionHeader partitionHeader;
private final TMD tmd; private final TMD tmd;
private final byte[] rawTMD; private final byte[] rawTMD;
private final byte[] rawCert; private final byte[] rawCert;
private final byte[] rawTicket; private final byte[] rawTicket;
public WUDGamePartition(String partitionName, long partitionOffset, byte[] rawTMD, byte[] rawCert, byte[] rawTicket) throws ParseException { public WUDGamePartition(String partitionName, long partitionOffset, WUDPartitionHeader partitionHeader, byte[] rawTMD, byte[] rawCert, byte[] rawTicket)
throws ParseException {
super(partitionName, partitionOffset); super(partitionName, partitionOffset);
this.partitionHeader = partitionHeader;
this.rawTMD = rawTMD; this.rawTMD = rawTMD;
this.tmd = TMD.parseTMD(rawTMD); this.tmd = TMD.parseTMD(rawTMD);
this.rawCert = rawCert; this.rawCert = rawCert;

108
src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfoParser.java
View File

@ -43,7 +43,9 @@ import lombok.extern.java.Log;
// TODO: reduce magic numbers // TODO: reduce magic numbers
public final class WUDInfoParser { public final class WUDInfoParser {
public static byte[] DECRYPTED_AREA_SIGNATURE = new byte[] { (byte) 0xCC, (byte) 0xA6, (byte) 0xE6, 0x7B }; public static byte[] DECRYPTED_AREA_SIGNATURE = new byte[] { (byte) 0xCC, (byte) 0xA6, (byte) 0xE6, 0x7B };
public static byte[] PARTITION_START_SIGNATURE = new byte[] { (byte) 0xCC, (byte) 0x93, (byte) 0xA4, (byte) 0xF5 };
public static byte[] PARTITION_FILE_TABLE_SIGNATURE = new byte[] { 0x46, 0x53, 0x54, 0x00 }; // "FST" public static byte[] PARTITION_FILE_TABLE_SIGNATURE = new byte[] { 0x46, 0x53, 0x54, 0x00 }; // "FST"
public final static int SECTOR_SIZE = 0x8000;
public final static int PARTITION_TOC_OFFSET = 0x800; public final static int PARTITION_TOC_OFFSET = 0x800;
public final static int PARTITION_TOC_ENTRY_SIZE = 0x80; public final static int PARTITION_TOC_ENTRY_SIZE = 0x80;
@ -58,13 +60,7 @@ public final class WUDInfoParser {
public static WUDInfo createAndLoad(WUDDiscReader discReader, byte[] titleKey) throws IOException, ParseException { public static WUDInfo createAndLoad(WUDDiscReader discReader, byte[] titleKey) throws IOException, ParseException {
WUDInfo result = new WUDInfo(titleKey, discReader); WUDInfo result = new WUDInfo(titleKey, discReader);
byte[] PartitionTocBlock; byte[] PartitionTocBlock = readFromDisc(result, Settings.WIIU_DECRYPTED_AREA_OFFSET, SECTOR_SIZE);
if (titleKey == null) {
PartitionTocBlock = discReader.readEncryptedToByteArray(Settings.WIIU_DECRYPTED_AREA_OFFSET, 0, 0x8000);
} else {
PartitionTocBlock = discReader.readDecryptedToByteArray(Settings.WIIU_DECRYPTED_AREA_OFFSET, 0, 0x8000, titleKey, null, true);
}
//
// verify DiscKey before proceeding // verify DiscKey before proceeding
if (!Arrays.equals(Arrays.copyOfRange(PartitionTocBlock, 0, 4), DECRYPTED_AREA_SIGNATURE)) { if (!Arrays.equals(Arrays.copyOfRange(PartitionTocBlock, 0, 4), DECRYPTED_AREA_SIGNATURE)) {
@ -99,11 +95,11 @@ public final class WUDInfoParser {
} }
String partitionName = new String(Arrays.copyOfRange(partitionIdentifier, 0, j)); String partitionName = new String(Arrays.copyOfRange(partitionIdentifier, 0, j));
// calculate partition offset (relative from WIIU_DECRYPTED_AREA_OFFSET) from decrypted TOC // calculate partition offset from decrypted TOC
long tmp = ByteUtils.getUnsingedIntFromBytes(partitionTocBlock, (PARTITION_TOC_OFFSET + (i * PARTITION_TOC_ENTRY_SIZE) + 0x20), long tmp = ByteUtils.getUnsingedIntFromBytes(partitionTocBlock, (PARTITION_TOC_OFFSET + (i * PARTITION_TOC_ENTRY_SIZE) + 0x20),
ByteOrder.BIG_ENDIAN); ByteOrder.BIG_ENDIAN);
long partitionOffset = ((tmp * (long) 0x8000) - 0x10000); long partitionOffset = (tmp * (long) 0x8000);
internalPartitions.put(partitionName, partitionOffset); internalPartitions.put(partitionName, partitionOffset);
} }
@ -117,16 +113,19 @@ public final class WUDInfoParser {
// siPartition // siPartition
long siPartitionOffset = siPartitionPair.getValue(); long siPartitionOffset = siPartitionPair.getValue();
byte[] fileTableBlock; byte[] partitionHeaderData = readFromDisc(wudInfo, false, siPartitionOffset, 0x20);
if (!Arrays.equals(Arrays.copyOf(partitionHeaderData, 0x4), PARTITION_START_SIGNATURE)) {
if (wudInfo.getTitleKey() == null) { throw new ParseException("Failed to get the partition data of the SI partition.", 0);
fileTableBlock = wudInfo.getWUDDiscReader().readEncryptedToByteArray(Settings.WIIU_DECRYPTED_AREA_OFFSET + siPartitionOffset, 0, 0x8000);
} else {
fileTableBlock = wudInfo.getWUDDiscReader().readDecryptedToByteArray(Settings.WIIU_DECRYPTED_AREA_OFFSET + siPartitionOffset, 0, 0x8000,
wudInfo.getTitleKey(), null, true);
} }
if (!Arrays.equals(Arrays.copyOfRange(fileTableBlock, 0, 4), PARTITION_FILE_TABLE_SIGNATURE)) { long headerSize = ByteUtils.getUnsingedIntFromBytes(partitionHeaderData, 0x04);
long absoluteFSTOffset = siPartitionOffset + headerSize;
long FSTSize = ByteUtils.getUnsingedIntFromBytes(partitionHeaderData, 0x14);
byte[] fileTableBlock = readFromDisc(wudInfo, absoluteFSTOffset, FSTSize);
if (!Arrays.equals(Arrays.copyOfRange(fileTableBlock, 0, 4), WUDInfoParser.PARTITION_FILE_TABLE_SIGNATURE)) {
log.info("FST Decrpytion failed"); log.info("FST Decrpytion failed");
throw new ParseException("Failed to decrypt the FST of the SI partition.", 0); throw new ParseException("Failed to decrypt the FST of the SI partition.", 0);
} }
@ -135,23 +134,34 @@ public final class WUDInfoParser {
for (val dirChilden : siFST.getRoot().getDirChildren()) { for (val dirChilden : siFST.getRoot().getDirChildren()) {
// The SI partition contains the tmd, cert and tik for every GM partition. // The SI partition contains the tmd, cert and tik for every GM partition.
byte[] rawTIK = getFSTEntryAsByte(dirChilden.getFullPath() + File.separator + WUD_TICKET_FILENAME, siPartitionOffset, siFST, byte[] rawTIK = getFSTEntryAsByte(dirChilden.getFullPath() + File.separator + WUD_TICKET_FILENAME, siPartitionOffset, headerSize, siFST,
wudInfo.getWUDDiscReader(), wudInfo.getTitleKey()); wudInfo.getWUDDiscReader(), wudInfo.getTitleKey());
byte[] rawTMD = getFSTEntryAsByte(dirChilden.getFullPath() + File.separator + WUD_TMD_FILENAME, siPartitionOffset, siFST, byte[] rawTMD = getFSTEntryAsByte(dirChilden.getFullPath() + File.separator + WUD_TMD_FILENAME, siPartitionOffset, headerSize, siFST,
wudInfo.getWUDDiscReader(), wudInfo.getTitleKey()); wudInfo.getWUDDiscReader(), wudInfo.getTitleKey());
byte[] rawCert = getFSTEntryAsByte(dirChilden.getFullPath() + File.separator + WUD_CERT_FILENAME, siPartitionOffset, siFST, byte[] rawCert = getFSTEntryAsByte(dirChilden.getFullPath() + File.separator + WUD_CERT_FILENAME, siPartitionOffset, headerSize, siFST,
wudInfo.getWUDDiscReader(), wudInfo.getTitleKey()); wudInfo.getWUDDiscReader(), wudInfo.getTitleKey());
String partitionName = "GM" + Utils.ByteArrayToString(Arrays.copyOfRange(rawTIK, 0x1DC, 0x1DC + 0x08)); String partitionName = "GM" + Utils.ByteArrayToString(Arrays.copyOfRange(rawTIK, 0x1DC, 0x1DC + 0x08));
val curPartitionOpt = internalPartitions.entrySet().stream().filter(e -> e.getKey().startsWith(partitionName)).findFirst(); val curPartitionOpt = internalPartitions.entrySet().stream().filter(e -> e.getKey().startsWith(partitionName)).findFirst();
val curPartitionPair = curPartitionOpt.orElseThrow(() -> new ParseException("partition not foud.", 0)); val curPartitionPair = curPartitionOpt.orElseThrow(() -> new ParseException("partition not found.", 0));
long curPartitionOffset = curPartitionPair.getValue(); long curPartitionOffset = curPartitionPair.getValue();
WUDGamePartition curPartition = new WUDGamePartition(curPartitionPair.getKey(), curPartitionOffset, rawTMD, rawCert, rawTIK); byte[] curPartitionHeaderMeta = readFromDisc(wudInfo, false, curPartitionOffset, 0x20);
byte[] header = wudInfo.getWUDDiscReader().readEncryptedToByteArray(curPartition.getPartitionOffset() + 0x10000, 0, 0x8000);
if (!Arrays.equals(Arrays.copyOf(curPartitionHeaderMeta, 0x4), PARTITION_START_SIGNATURE)) {
throw new ParseException("Failed to decrypt the SI partition.", 0);
}
long curHeaderSize = ByteUtils.getUnsingedIntFromBytes(curPartitionHeaderMeta, 0x04);
byte[] header = wudInfo.getWUDDiscReader().readEncryptedToByteArray(curPartitionOffset, 0, curHeaderSize);
WUDPartitionHeader partitionHeader = WUDPartitionHeader.parseHeader(header); WUDPartitionHeader partitionHeader = WUDPartitionHeader.parseHeader(header);
curPartition.setPartitionHeader(partitionHeader);
WUDGamePartition curPartition = new WUDGamePartition(curPartitionPair.getKey(), curPartitionOffset + curHeaderSize, partitionHeader, rawTMD,
rawCert, rawTIK);
partitionsResult.put(curPartitionPair.getKey(), curPartition); partitionsResult.put(curPartitionPair.getKey(), curPartition);
} }
} }
@ -161,25 +171,26 @@ public final class WUDInfoParser {
String curPartionName = dataPartition.getKey(); String curPartionName = dataPartition.getKey();
long partitionOffset = dataPartition.getValue(); long partitionOffset = dataPartition.getValue();
byte[] curFileTableBlock; byte[] partitionHeaderData = readFromDisc(wudInfo, false, partitionOffset, 0x20);
if (wudInfo.getTitleKey() == null) {
curFileTableBlock = wudInfo.getWUDDiscReader().readEncryptedToByteArray(Settings.WIIU_DECRYPTED_AREA_OFFSET + partitionOffset, 0, 0x8000); if (!Arrays.equals(Arrays.copyOf(partitionHeaderData, 0x4), PARTITION_START_SIGNATURE)) {
} else { throw new ParseException("Failed to decrypt the " + curPartionName + " partition.", 0);
curFileTableBlock = wudInfo.getWUDDiscReader().readDecryptedToByteArray(Settings.WIIU_DECRYPTED_AREA_OFFSET + partitionOffset, 0, 0x8000,
wudInfo.getTitleKey(), null, true);
} }
long headerSize = ByteUtils.getUnsingedIntFromBytes(partitionHeaderData, 0x04);
long absoluteFSTOffset = partitionOffset + headerSize;
long FSTSize = ByteUtils.getUnsingedIntFromBytes(partitionHeaderData, 0x14);
byte[] curFileTableBlock = readFromDisc(wudInfo, absoluteFSTOffset, FSTSize);
if (!Arrays.equals(Arrays.copyOfRange(curFileTableBlock, 0, 4), WUDInfoParser.PARTITION_FILE_TABLE_SIGNATURE)) { if (!Arrays.equals(Arrays.copyOfRange(curFileTableBlock, 0, 4), WUDInfoParser.PARTITION_FILE_TABLE_SIGNATURE)) {
log.info("FST Decrpytion failed"); throw new IOException("FST Decrpytion failed");
throw new ParseException("Failed to decrypt the FST of the " + curPartionName + " partition.", 0);
} }
FST curFST = FST.parseFST(curFileTableBlock, null); FST curFST = FST.parseFST(curFileTableBlock, null);
WUDDataPartition curDataPartition = new WUDDataPartition(curPartionName, partitionOffset, curFST); WUDDataPartition curDataPartition = new WUDDataPartition(curPartionName, partitionOffset + headerSize, curFST);
byte[] header = wudInfo.getWUDDiscReader().readEncryptedToByteArray(curDataPartition.getPartitionOffset() + 0x10000, 0, 0x8000);
WUDPartitionHeader partitionHeader = WUDPartitionHeader.parseHeader(header);
curDataPartition.setPartitionHeader(partitionHeader);
partitionsResult.put(curPartionName, curDataPartition); partitionsResult.put(curPartionName, curDataPartition);
} }
@ -187,14 +198,27 @@ public final class WUDInfoParser {
return partitionsResult.values(); return partitionsResult.values();
} }
private static byte[] getFSTEntryAsByte(String filePath, long partitionOffset, FST fst, WUDDiscReader discReader, byte[] key) throws IOException { private static byte[] readFromDisc(WUDInfo wudInfo, long offset, long size) throws IOException {
return readFromDisc(wudInfo, wudInfo.getTitleKey() != null, offset, size);
}
private static byte[] readFromDisc(WUDInfo wudInfo, boolean decrypt, long offset, long size) throws IOException {
if (!decrypt) {
return wudInfo.getWUDDiscReader().readEncryptedToByteArray(offset, 0, size);
} else {
return wudInfo.getWUDDiscReader().readDecryptedToByteArray(offset, 0, size, wudInfo.getTitleKey(), null, true);
}
}
private static byte[] getFSTEntryAsByte(String filePath, long partitionOffset, long headerSize, FST fst, WUDDiscReader discReader, byte[] key)
throws IOException {
FSTEntry entry = FSTUtils.getEntryByFullPath(fst.getRoot(), filePath).orElseThrow(() -> new FileNotFoundException(filePath + " was not found.")); FSTEntry entry = FSTUtils.getEntryByFullPath(fst.getRoot(), filePath).orElseThrow(() -> new FileNotFoundException(filePath + " was not found."));
ContentFSTInfo info = fst.getContentFSTInfos().get((int) entry.getContentFSTID()); ContentFSTInfo info = fst.getContentFSTInfos().get((int) entry.getContentFSTID());
if (key == null) { if (key == null) {
return discReader.readEncryptedToByteArray(((long) Settings.WIIU_DECRYPTED_AREA_OFFSET) + partitionOffset + (long) info.getOffset(), return discReader.readEncryptedToByteArray(headerSize + partitionOffset + (long) info.getOffset(), entry.getFileOffset(),
entry.getFileOffset(), (int) entry.getFileSize()); (int) entry.getFileSize());
} }
// Calculating the IV // Calculating the IV
@ -202,8 +226,8 @@ public final class WUDInfoParser {
byteBuffer.position(0x08); byteBuffer.position(0x08);
byte[] IV = byteBuffer.putLong(entry.getFileOffset() >> 16).array(); byte[] IV = byteBuffer.putLong(entry.getFileOffset() >> 16).array();
return discReader.readDecryptedToByteArray(((long) Settings.WIIU_DECRYPTED_AREA_OFFSET) + partitionOffset + info.getOffset(), entry.getFileOffset(), return discReader.readDecryptedToByteArray(headerSize + partitionOffset + info.getOffset(), entry.getFileOffset(), (int) entry.getFileSize(), key, IV,
(int) entry.getFileSize(), key, IV, false); false);
} }
} }

7
src/de/mas/wiiu/jnus/implementations/wud/parser/WUDPartition.java
View File

@ -16,17 +16,10 @@
****************************************************************************/ ****************************************************************************/
package de.mas.wiiu.jnus.implementations.wud.parser; package de.mas.wiiu.jnus.implementations.wud.parser;
import de.mas.wiiu.jnus.Settings;
import lombok.Data; import lombok.Data;
@Data @Data
public abstract class WUDPartition { public abstract class WUDPartition {
private final String partitionName; private final String partitionName;
private final long partitionOffset; private final long partitionOffset;
private WUDPartitionHeader partitionHeader;
public long getAbsolutePartitionOffset() {
return Settings.WIIU_DECRYPTED_AREA_OFFSET + getPartitionOffset();
}
} }