Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2022-01-19 18:35:40 +01:00
37 changed files with 1061 additions and 365 deletions

View File

@@ -24,8 +24,8 @@
*/
package net.runelite.cache.util;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.runelite.cache.io.InputStream;
import net.runelite.cache.io.OutputStream;
public class Xtea
{
@@ -42,13 +42,13 @@ public class Xtea
public byte[] encrypt(byte[] data, int len)
{
ByteBuf buf = Unpooled.wrappedBuffer(data, 0, len);
ByteBuf out = Unpooled.buffer(len);
InputStream in = new InputStream(data);
OutputStream out = new OutputStream(len);
int numBlocks = len / 8;
for (int block = 0; block < numBlocks; ++block)
{
int v0 = buf.readInt();
int v1 = buf.readInt();
int v0 = in.readInt();
int v1 = in.readInt();
int sum = 0;
for (int i = 0; i < ROUNDS; ++i)
{
@@ -59,19 +59,19 @@ public class Xtea
out.writeInt(v0);
out.writeInt(v1);
}
out.writeBytes(buf);
return out.array();
out.writeBytes(in.getRemaining());
return out.flip();
}
public byte[] decrypt(byte[] data, int len)
{
ByteBuf buf = Unpooled.wrappedBuffer(data, 0, len);
ByteBuf out = Unpooled.buffer(len);
InputStream in = new InputStream(data);
OutputStream out = new OutputStream(len);
int numBlocks = len / 8;
for (int block = 0; block < numBlocks; ++block)
{
int v0 = buf.readInt();
int v1 = buf.readInt();
int v0 = in.readInt();
int v1 = in.readInt();
int sum = GOLDEN_RATIO * ROUNDS;
for (int i = 0; i < ROUNDS; ++i)
{
@@ -82,7 +82,7 @@ public class Xtea
out.writeInt(v0);
out.writeInt(v1);
}
out.writeBytes(buf);
return out.array();
out.writeBytes(in.getRemaining());
return out.flip();
}
}