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

Swap offset and size arguments in decrypt functions

Browse Source
This commit is contained in:
Maschell 2019-04-26 09:49:50 +02:00
parent 6981345467
commit 995d548c11
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/de/mas/wiiu/jnus/implementations/FSTDataProviderNUSTitle.java
View File

@ -146,7 +146,7 @@ public class FSTDataProviderNUSTitle implements FSTDataProvider, HasNUSTitle {
if (c.isHashed()) { if (c.isHashed()) {
h3HashedOpt = dataProvider.getContentH3Hash(c); h3HashedOpt = dataProvider.getContentH3Hash(c);
} }
return nusdecryption.decryptStreams(in, outputStream, fileSize, fileOffset, c, h3HashedOpt); return nusdecryption.decryptStreams(in, outputStream, fileOffset, fileSize, c, h3HashedOpt);
} catch (CheckSumWrongException e) { } catch (CheckSumWrongException e) {
if (c.isUNKNWNFlag1Set()) { if (c.isUNKNWNFlag1Set()) {
log.info("Hash doesn't match. But file is optional. Don't worry."); log.info("Hash doesn't match. But file is optional. Don't worry.");

10
src/de/mas/wiiu/jnus/utils/cryptography/NUSDecryption.java
View File

@ -57,7 +57,7 @@ public class NUSDecryption extends AESDecryption {
return decrypt(blockBuffer, offset, BLOCKSIZE); return decrypt(blockBuffer, offset, BLOCKSIZE);
} }
public void decryptFileStream(InputStream inputStream, OutputStream outputStream, long filesize, long fileOffset, short contentIndex, byte[] h3hash, public void decryptFileStream(InputStream inputStream, OutputStream outputStream, long fileOffset, long filesize, short contentIndex, byte[] h3hash,
long expectedSizeForHash) throws IOException, CheckSumWrongException { long expectedSizeForHash) throws IOException, CheckSumWrongException {
MessageDigest sha1 = null; MessageDigest sha1 = null;
MessageDigest sha1fallback = null; MessageDigest sha1fallback = null;
@ -191,7 +191,7 @@ public class NUSDecryption extends AESDecryption {
} }
} }
public void decryptFileStreamHashed(InputStream inputStream, OutputStream outputStream, long filesize, long fileoffset, short contentIndex, byte[] h3Hash) public void decryptFileStreamHashed(InputStream inputStream, OutputStream outputStream, long fileoffset, long filesize, short contentIndex, byte[] h3Hash)
throws IOException, CheckSumWrongException, NoSuchAlgorithmException { throws IOException, CheckSumWrongException, NoSuchAlgorithmException {
int BLOCKSIZE = 0x10000; int BLOCKSIZE = 0x10000;
int HASHBLOCKSIZE = 0xFC00; int HASHBLOCKSIZE = 0xFC00;
@ -276,7 +276,7 @@ public class NUSDecryption extends AESDecryption {
return output; return output;
} }
public boolean decryptStreams(InputStream inputStream, OutputStream outputStream, long size, long offset, Content content, Optional<byte[]> h3HashHashed) public boolean decryptStreams(InputStream inputStream, OutputStream outputStream, long offset, long size, Content content, Optional<byte[]> h3HashHashed)
throws IOException, CheckSumWrongException, NoSuchAlgorithmException { throws IOException, CheckSumWrongException, NoSuchAlgorithmException {
short contentIndex = (short) content.getIndex(); short contentIndex = (short) content.getIndex();
@ -287,7 +287,7 @@ public class NUSDecryption extends AESDecryption {
if (content.isEncrypted()) { if (content.isEncrypted()) {
if (content.isHashed()) { if (content.isHashed()) {
byte[] h3 = h3HashHashed.orElseThrow(() -> new FileNotFoundException("h3 hash not found.")); byte[] h3 = h3HashHashed.orElseThrow(() -> new FileNotFoundException("h3 hash not found."));
decryptFileStreamHashed(inputStream, outputStream, size, offset, (short) contentIndex, h3); decryptFileStreamHashed(inputStream, outputStream, offset, size, (short) contentIndex, h3);
} else { } else {
byte[] h3Hash = content.getSHA2Hash(); byte[] h3Hash = content.getSHA2Hash();
// We want to check if we read the whole file or just a part of it. // We want to check if we read the whole file or just a part of it.
@ -297,7 +297,7 @@ public class NUSDecryption extends AESDecryption {
if (size > 0 && size < fstFileSize) { if (size > 0 && size < fstFileSize) {
h3Hash = null; h3Hash = null;
} }
decryptFileStream(inputStream, outputStream, size, offset, (short) contentIndex, h3Hash, encryptedFileSize); decryptFileStream(inputStream, outputStream, offset, size, (short) contentIndex, h3Hash, encryptedFileSize);
} }
} else { } else {
StreamUtils.saveInputStreamToOutputStreamWithHash(inputStream, outputStream, size, content.getSHA2Hash(), encryptedFileSize); StreamUtils.saveInputStreamToOutputStreamWithHash(inputStream, outputStream, size, content.getSHA2Hash(), encryptedFileSize);