diff --git a/cache/src/main/kotlin/org/openrs2/cache/Js5MasterIndex.kt b/cache/src/main/kotlin/org/openrs2/cache/Js5MasterIndex.kt index 871c3c7e..66745f80 100644 --- a/cache/src/main/kotlin/org/openrs2/cache/Js5MasterIndex.kt +++ b/cache/src/main/kotlin/org/openrs2/cache/Js5MasterIndex.kt @@ -7,7 +7,7 @@ import org.openrs2.buffer.crc32 import org.openrs2.buffer.use import org.openrs2.crypto.Rsa import org.openrs2.crypto.Whirlpool -import org.openrs2.crypto.rsaCrypt +import org.openrs2.crypto.rsa import org.openrs2.crypto.whirlpool public data class Js5MasterIndex( @@ -91,7 +91,7 @@ public data class Js5MasterIndex( plaintext.writeByte(Rsa.MAGIC) plaintext.writeBytes(digest) - plaintext.rsaCrypt(key).use { ciphertext -> + plaintext.rsa(key).use { ciphertext -> buf.writeBytes(ciphertext) } } @@ -217,7 +217,7 @@ public data class Js5MasterIndex( private fun decrypt(buf: ByteBuf, key: RSAKeyParameters?): ByteBuf { return if (key != null) { - buf.rsaCrypt(key) + buf.rsa(key) } else { buf.retain() } diff --git a/crypto/src/main/kotlin/org/openrs2/crypto/Rsa.kt b/crypto/src/main/kotlin/org/openrs2/crypto/Rsa.kt index e680a04d..aafd77a8 100644 --- a/crypto/src/main/kotlin/org/openrs2/crypto/Rsa.kt +++ b/crypto/src/main/kotlin/org/openrs2/crypto/Rsa.kt @@ -40,8 +40,8 @@ private fun BigInteger.toByteBuf(): ByteBuf { return Unpooled.wrappedBuffer(toByteArray()) } -public fun ByteBuf.rsaCrypt(key: RSAKeyParameters): ByteBuf { - return Rsa.crypt(toBigInteger(), key).toByteBuf() +public fun ByteBuf.rsa(key: RSAKeyParameters): ByteBuf { + return Rsa.apply(toBigInteger(), key).toByteBuf() } public fun RSAPrivateCrtKeyParameters.toKeySpec(): KeySpec { @@ -97,7 +97,7 @@ public object Rsa { } } - public fun crypt(ciphertext: BigInteger, key: RSAKeyParameters): BigInteger { + public fun apply(ciphertext: BigInteger, key: RSAKeyParameters): BigInteger { if (key is RSAPrivateCrtKeyParameters) { // blind the input val e = key.publicExponent diff --git a/crypto/src/test/kotlin/org/openrs2/crypto/RsaTest.kt b/crypto/src/test/kotlin/org/openrs2/crypto/RsaTest.kt index 78be3038..aefe6d28 100644 --- a/crypto/src/test/kotlin/org/openrs2/crypto/RsaTest.kt +++ b/crypto/src/test/kotlin/org/openrs2/crypto/RsaTest.kt @@ -51,34 +51,34 @@ object RsaTest { val (public, private) = Rsa.generateKeyPair(Rsa.CLIENT_KEY_LENGTH) val expectedPlaintext = BigInteger("1337") - val ciphertext = Rsa.crypt(expectedPlaintext, public) - val actualPlaintext = Rsa.crypt(ciphertext, private) + val ciphertext = Rsa.apply(expectedPlaintext, public) + val actualPlaintext = Rsa.apply(ciphertext, private) assertEquals(expectedPlaintext, actualPlaintext) } @Test fun testEncrypt() { - val ciphertext = Rsa.crypt(BigInteger("65"), PUBLIC_KEY) + val ciphertext = Rsa.apply(BigInteger("65"), PUBLIC_KEY) assertEquals(BigInteger("2790"), ciphertext) } @Test fun testDecrypt() { - val ciphertext = Rsa.crypt(BigInteger("2790"), PRIVATE_KEY) + val ciphertext = Rsa.apply(BigInteger("2790"), PRIVATE_KEY) assertEquals(BigInteger("65"), ciphertext) } @Test fun testDecryptCrt() { - val ciphertext = Rsa.crypt(BigInteger("2790"), PRIVATE_KEY_CRT) + val ciphertext = Rsa.apply(BigInteger("2790"), PRIVATE_KEY_CRT) assertEquals(BigInteger("65"), ciphertext) } @Test fun testEncryptByteBuf() { wrappedBuffer(65).use { plaintext -> - plaintext.rsaCrypt(PUBLIC_KEY).use { ciphertext -> + plaintext.rsa(PUBLIC_KEY).use { ciphertext -> wrappedBuffer(10, 230.toByte()).use { expectedCiphertext -> assertEquals(expectedCiphertext, ciphertext) } @@ -89,7 +89,7 @@ object RsaTest { @Test fun testDecryptByteBuf() { wrappedBuffer(10, 230.toByte()).use { ciphertext -> - ciphertext.rsaCrypt(PRIVATE_KEY).use { plaintext -> + ciphertext.rsa(PRIVATE_KEY).use { plaintext -> wrappedBuffer(65).use { expectedPlaintext -> assertEquals(expectedPlaintext, plaintext) }