The-Homebrew-Cloud/JNUSLib
2
0
Fork 0
mirror of https://github.com/Maschell/JNUSLib.git synced 2025-02-19 17:52:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed block_size and condition in wud decrypted reading.

Browse Source
This commit is contained in:
Maschell 2018-12-06 15:49:46 +01:00
parent bb1c6b30d4
commit bfbbafc269
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/de/mas/wiiu/jnus/implementations/wud/reader/WUDDiscReader.java
View File

@ -94,7 +94,7 @@ public abstract class WUDDiscReader {
* @throws IOException * @throws IOException
*/ */
public byte[] readDecryptedChunk(long readOffset, byte[] key, byte[] IV) throws IOException { public byte[] readDecryptedChunk(long readOffset, byte[] key, byte[] IV) throws IOException {
int chunkSize = 0x8000; int chunkSize = 0x10000;
byte[] encryptedChunk = readEncryptedToByteArray(readOffset, 0, chunkSize); byte[] encryptedChunk = readEncryptedToByteArray(readOffset, 0, chunkSize);
byte[] decryptedChunk = new byte[chunkSize]; byte[] decryptedChunk = new byte[chunkSize];
@ -120,18 +120,18 @@ public abstract class WUDDiscReader {
long readOffset; long readOffset;
int blockSize = 0x8000; final int BLOCK_SIZE = 0x10000;
long totalread = 0; long totalread = 0;
do { do {
long blockNumber = (usedFileOffset / blockSize); long blockNumber = (usedFileOffset / BLOCK_SIZE);
long blockOffset = (usedFileOffset % blockSize); long blockOffset = (usedFileOffset % BLOCK_SIZE);
readOffset = clusterOffset + (blockNumber * blockSize); readOffset = clusterOffset + (blockNumber * BLOCK_SIZE);
// (long)WiiUDisc.WIIU_DECRYPTED_AREA_OFFSET + volumeOffset + clusterOffset + (blockStructure.getBlockNumber() * 0x8000); // (long)WiiUDisc.WIIU_DECRYPTED_AREA_OFFSET + volumeOffset + clusterOffset + (blockStructure.getBlockNumber() * 0x8000);
buffer = readDecryptedChunk(readOffset, key, usedIV); buffer = readDecryptedChunk(readOffset, key, usedIV);
maxCopySize = 0x8000 - blockOffset; maxCopySize = BLOCK_SIZE - blockOffset;
copySize = (usedSize > maxCopySize) ? maxCopySize : usedSize; copySize = (usedSize > maxCopySize) ? maxCopySize : usedSize;
outputStream.write(Arrays.copyOfRange(buffer, (int) blockOffset, (int) copySize)); outputStream.write(Arrays.copyOfRange(buffer, (int) blockOffset, (int) copySize));
@ -140,7 +140,7 @@ public abstract class WUDDiscReader {
// update counters // update counters
usedSize -= copySize; usedSize -= copySize;
usedFileOffset += copySize; usedFileOffset += copySize;
} while (totalread < usedSize); } while (totalread < size);
outputStream.close(); outputStream.close();
} }