desu/libKonogonka
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Correct references from Java 8
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Dmitry Isaenko 2023-02-07 00:08:33 +03:00
parent d8da67b081
commit de15275297
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>ru.redrise</groupId> <groupId>ru.redrise</groupId>
<artifactId>libKonogonka</artifactId> <artifactId>libKonogonka</artifactId>
<version>0.1</version> <version>0.2-SNAPSHOT</version>
<url>https://git.redrise.ru/desu/${project.name}}/</url> <url>https://git.redrise.ru/desu/${project.name}}/</url>
<description> <description>
@ -57,6 +57,7 @@
<dependencies> <dependencies>
<!-- For AES XTS we use bouncycastle --> <!-- For AES XTS we use bouncycastle -->
<!-- SELECTED LOG4J versions works with Java 8: 1.60 or 1.63 -->
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
@ -71,6 +72,7 @@
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core --> <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<!-- SELECTED LOG4J versions works with Java 8: 2.17.1 -->
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>

3
src/main/java/libKonogonka/aesctr/AesCtrDecryptClassic.java
View file

@ -24,6 +24,7 @@ import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import java.math.BigInteger; import java.math.BigInteger;
import java.nio.Buffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public class AesCtrDecryptClassic extends AesCtrDecrypt { public class AesCtrDecryptClassic extends AesCtrDecrypt {
@ -52,7 +53,7 @@ public class AesCtrDecryptClassic extends AesCtrDecrypt {
byte[] ctrCalculated = ctr.add(updateTo).toByteArray(); byte[] ctrCalculated = ctr.add(updateTo).toByteArray();
if (ctrCalculated.length != 0x10) { if (ctrCalculated.length != 0x10) {
ByteBuffer ctrByteBuffer = ByteBuffer.allocate(0x10); ByteBuffer ctrByteBuffer = ByteBuffer.allocate(0x10);
ctrByteBuffer.position(0x10 - ctrCalculated.length); ((Buffer) ctrByteBuffer).position(0x10 - ctrCalculated.length);
ctrByteBuffer.put(ctrCalculated); ctrByteBuffer.put(ctrCalculated);
return ctrByteBuffer.array(); return ctrByteBuffer.array();
} }

3
src/main/java/libKonogonka/fs/other/System2/ini1/Kip1Unpacker.java
View file

@ -25,6 +25,7 @@ import libKonogonka.aesctr.InFileStreamClassicProducer;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.nio.Buffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -156,7 +157,7 @@ public class Kip1Unpacker {
ByteBuffer resultingHeader = ByteBuffer.allocate(HEADER_SIZE).order(ByteOrder.LITTLE_ENDIAN); ByteBuffer resultingHeader = ByteBuffer.allocate(HEADER_SIZE).order(ByteOrder.LITTLE_ENDIAN);
resultingHeader.put("KIP1".getBytes(StandardCharsets.US_ASCII)) resultingHeader.put("KIP1".getBytes(StandardCharsets.US_ASCII))
.put(kip1Header.getName().getBytes(StandardCharsets.US_ASCII)); .put(kip1Header.getName().getBytes(StandardCharsets.US_ASCII));
resultingHeader.position(0x10); ((Buffer) resultingHeader).position(0x10);
resultingHeader.put(kip1Header.getProgramId()) resultingHeader.put(kip1Header.getProgramId())
.putInt(kip1Header.getVersion()) .putInt(kip1Header.getVersion())
.put(kip1Header.getMainThreadPriority()) .put(kip1Header.getMainThreadPriority())

2
src/main/resources/log4j2.properties
View file

@ -15,7 +15,7 @@ status = error
name = DebugConfigDevelopmentOnlyVerbose name = DebugConfigDevelopmentOnlyVerbose
# Configure root logger level # Configure root logger level
rootLogger.level = INFO rootLogger.level = DEBUG
# Root logger referring to console appender # Root logger referring to console appender
rootLogger.appenderRef.stdout.ref = consoleLogger rootLogger.appenderRef.stdout.ref = consoleLogger