diff --git a/crypto/src/main/kotlin/org/openrs2/crypto/Pkcs12KeyStore.kt b/crypto/src/main/kotlin/org/openrs2/crypto/Pkcs12KeyStore.kt index 7f26d6b7..f47286ce 100644 --- a/crypto/src/main/kotlin/org/openrs2/crypto/Pkcs12KeyStore.kt +++ b/crypto/src/main/kotlin/org/openrs2/crypto/Pkcs12KeyStore.kt @@ -51,6 +51,7 @@ public class Pkcs12KeyStore private constructor(privateKeyEntry: KeyStore.Privat private val SHA256_WITH_RSA = AlgorithmIdentifier(PKCSObjectIdentifiers.sha256WithRSAEncryption) private val SHA256 = AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256) + @JvmStatic public fun open(path: Path, signerName: String): Pkcs12KeyStore { val keyStore = KeyStore.getInstance("PKCS12") if (Files.exists(path)) { diff --git a/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt b/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt index 93570965..0fbd0335 100644 --- a/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt +++ b/crypto/src/main/kotlin/org/openrs2/crypto/Whirlpool.kt @@ -266,6 +266,8 @@ public class Whirlpool { } } + @JvmOverloads + @JvmStatic public fun whirlpool(data: ByteArray, off: Int = 0, len: Int = data.size): ByteArray { val source: ByteArray if (off <= 0) { diff --git a/crypto/src/main/kotlin/org/openrs2/crypto/Xtea.kt b/crypto/src/main/kotlin/org/openrs2/crypto/Xtea.kt index eff2db8e..214387c5 100644 --- a/crypto/src/main/kotlin/org/openrs2/crypto/Xtea.kt +++ b/crypto/src/main/kotlin/org/openrs2/crypto/Xtea.kt @@ -32,18 +32,22 @@ public data class XteaKey( } public companion object { + @JvmStatic public val ZERO: XteaKey = XteaKey(0, 0, 0, 0) + @JvmStatic public fun fromIntArray(a: IntArray): XteaKey { require(a.size == 4) return XteaKey(a[0], a[1], a[2], a[3]) } + @JvmStatic public fun fromHex(s: String): XteaKey { return fromHexOrNull(s) ?: throw IllegalArgumentException() } + @JvmStatic public fun fromHexOrNull(s: String): XteaKey? { if (s.length != 32) { return null