From c70cfcfb30e6b31c86386d3fd9a9b7c683bf39fa Mon Sep 17 00:00:00 2001 From: Graham Date: Tue, 12 Jan 2021 19:37:56 +0000 Subject: [PATCH] Add ByteBuf.whirlpool() extension method Signed-off-by: Graham --- .../kotlin/org/openrs2/crypto/Whirlpool.kt | 18 ++++++ .../org/openrs2/crypto/WhirlpoolTest.kt | 58 +++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt b/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt index 4ada9500c0..cb444591b1 100644 --- a/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt +++ b/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt @@ -1,5 +1,23 @@ package org.openrs2.crypto +import com.google.common.base.Preconditions +import io.netty.buffer.ByteBuf +import io.netty.buffer.ByteBufUtil + +public fun ByteBuf.whirlpool(): ByteArray { + return whirlpool(readerIndex(), readableBytes()) +} + +public fun ByteBuf.whirlpool(index: Int, len: Int): ByteArray { + Preconditions.checkPositionIndexes(index, index + len, capacity()) + + return if (hasArray()) { + Whirlpool.whirlpool(array(), arrayOffset() + index, len) + } else { + Whirlpool.whirlpool(ByteBufUtil.getBytes(this, index, len, false)) + } +} + public class Whirlpool { private val bitLength = ByteArray(32) private val buffer = ByteArray(64) diff --git a/crypto/src/test/kotlin/org/openrs2/crypto/WhirlpoolTest.kt b/crypto/src/test/kotlin/org/openrs2/crypto/WhirlpoolTest.kt index 6a82095b08..ba877c7624 100644 --- a/crypto/src/test/kotlin/org/openrs2/crypto/WhirlpoolTest.kt +++ b/crypto/src/test/kotlin/org/openrs2/crypto/WhirlpoolTest.kt @@ -1,9 +1,14 @@ package org.openrs2.crypto +import io.netty.buffer.ByteBufAllocator import io.netty.buffer.ByteBufUtil +import io.netty.buffer.Unpooled import org.junit.jupiter.api.Assertions.assertArrayEquals +import org.openrs2.buffer.copiedBuffer +import org.openrs2.buffer.use import kotlin.streams.toList import kotlin.test.Test +import kotlin.test.assertFailsWith object WhirlpoolTest { private class IsoTestVector(input: String, expected: String) { @@ -61,6 +66,10 @@ object WhirlpoolTest { private val NESSIE_ZERO_VECTORS = readVectors("nessie-zero-vectors.txt") private val NESSIE_ONE_VECTORS = readVectors("nessie-one-vectors.txt") + private val QUICK_BROWN_FOX = ByteBufUtil.decodeHexDump( + "B97DE512E91E3828B40D2B0FDCE9CEB3C4A71F9BEA8D88E75C4FA854DF36725F" + + "D2B52EB6544EDCACD6F8BEDDFEA403CB55AE31F03AD62A5EF54E42EE82C3FB35" + ) private fun readVectors(file: String): List { val input = WhirlpoolTest::class.java.getResourceAsStream("whirlpool/$file") @@ -105,4 +114,53 @@ object WhirlpoolTest { assertArrayEquals(vector, actual) } } + + @Test + fun testByteBuf() { + val s = "AAThe quick brown fox jumps over the lazy dogA" + + /* + * Tests the hasArray() case. The slicedBuf trickery is to allow us + * to test a non-zero arrayOffset(). + */ + copiedBuffer(s).use { buf -> + val slicedBuf = buf.slice(1, buf.readableBytes() - 1) + assertArrayEquals(QUICK_BROWN_FOX, slicedBuf.whirlpool(1, slicedBuf.writerIndex() - 2)) + } + + // Tests the !hasArray() case. + ByteBufAllocator.DEFAULT.directBuffer().use { directBuf -> + directBuf.writeCharSequence(s, Charsets.UTF_8) + assertArrayEquals(QUICK_BROWN_FOX, directBuf.whirlpool(2, directBuf.writerIndex() - 3)) + } + + /* + * Check the whirlpool() method (with no arguments) sets the + * index/length correctly. + */ + copiedBuffer(s).use { buf -> + buf.readerIndex(2) + buf.writerIndex(buf.writerIndex() - 1) + assertArrayEquals(QUICK_BROWN_FOX, buf.whirlpool()) + } + } + + @Test + fun testByteBufBounds() { + assertFailsWith { + Unpooled.EMPTY_BUFFER.whirlpool(-1, 0) + } + + assertFailsWith { + Unpooled.EMPTY_BUFFER.whirlpool(0, -1) + } + + assertFailsWith { + Unpooled.EMPTY_BUFFER.whirlpool(1, 0) + } + + assertFailsWith { + Unpooled.EMPTY_BUFFER.whirlpool(0, 1) + } + } }