From 97a11ba7656e7350a07c586d08f626274db372c3 Mon Sep 17 00:00:00 2001 From: Graham Date: Tue, 14 Jan 2020 23:13:07 +0000 Subject: [PATCH] Inject RSAPrivateCrtKeyParameters in PublicKeyTransformer --- .../bundler/transform/PublicKeyTransformer.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt index 3317aeee15..9cbdc9315c 100644 --- a/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt +++ b/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt @@ -4,19 +4,18 @@ import com.github.michaelbull.logging.InlineLogger import dev.openrs2.asm.classpath.ClassPath import dev.openrs2.asm.classpath.Library import dev.openrs2.asm.transform.Transformer -import org.bouncycastle.crypto.params.RSAKeyParameters +import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.LdcInsnNode import org.objectweb.asm.tree.MethodNode +import javax.inject.Inject +import javax.inject.Singleton -class PublicKeyTransformer(private val key: RSAKeyParameters) : Transformer() { +@Singleton +class PublicKeyTransformer @Inject constructor(private val key: RSAPrivateCrtKeyParameters) : Transformer() { private var exponents = 0 private var moduli = 0 - init { - require(!key.isPrivate) - } - override fun preTransform(classPath: ClassPath) { exponents = 0 moduli = 0 @@ -30,7 +29,7 @@ class PublicKeyTransformer(private val key: RSAKeyParameters) : Transformer() { when (insn.cst) { JAGEX_EXPONENT -> { - insn.cst = key.exponent.toString() + insn.cst = key.publicExponent.toString() exponents++ } JAGEX_MODULUS -> {