Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Owain van Brakel
2019-10-31 19:13:27 +01:00
5 changed files with 31 additions and 40 deletions

View File

@@ -39,17 +39,20 @@ public abstract class RSBufferMixin implements RSBuffer
@Shadow("client")
private static RSClient client;
@Inject
private static BigInteger exponent = new BigInteger("10001", 16);
@Shadow("modulus")
private static BigInteger modulus;
@Copy("encryptRsa")
public void rs$encryptRsa(BigInteger var1, BigInteger var2)
{
}
abstract void rs$encryptRsa(BigInteger var1, BigInteger var2);
@Replace("encryptRsa")
public void rl$encryptRsa(BigInteger var1, BigInteger var2)
public void rl$encryptRsa(BigInteger exp, BigInteger mod)
{
rs$encryptRsa(exponent, client.getModulus());
if (modulus != null)
{
mod = modulus;
}
rs$encryptRsa(exp, mod);
}
}

View File

@@ -1752,20 +1752,13 @@ public abstract class RSClientMixin implements RSClient
}
@Inject
BigInteger modulus = new BigInteger("8ffe6122bc1531a9d3909c2cefb420d9099dcda7494cf98fcd054d7eac1f32c03cc1cff0955965d35dfb6bd322c5e9201941edfa6f26cfff45524daf4c6b09c8a121f3b0262443ca7164bbad436420e7fd23d9d2b74f228f68f961563e337b95772bf046cf05bb699549141325085c55e5d44ea15e3c7f17dd6c03d521f963f7", 16);
@Inject
@Override
public BigInteger getModulus()
{
return modulus;
}
private static BigInteger modulus;
@Inject
@Override
public void setModulus(BigInteger modulus)
{
this.modulus = modulus;
RSClientMixin.modulus = modulus;
}
@Copy("forceDisconnect")