Commit 965958bc authored by Him188's avatar Him188

Use encryptAndWrite

parent 04f8c36f
...@@ -2,8 +2,6 @@ package net.mamoe.mirai.network.protocol.tim.packet.login ...@@ -2,8 +2,6 @@ package net.mamoe.mirai.network.protocol.tim.packet.login
import net.mamoe.mirai.network.protocol.tim.TIMProtocol import net.mamoe.mirai.network.protocol.tim.TIMProtocol
import net.mamoe.mirai.network.protocol.tim.packet.* import net.mamoe.mirai.network.protocol.tim.packet.*
import net.mamoe.mirai.utils.ByteArrayDataOutputStream
import net.mamoe.mirai.utils.TEA
import net.mamoe.mirai.utils.hexToBytes import net.mamoe.mirai.utils.hexToBytes
import net.mamoe.mirai.utils.toUHexString import net.mamoe.mirai.utils.toUHexString
import java.io.DataInputStream import java.io.DataInputStream
...@@ -103,9 +101,7 @@ class ClientServerRedirectionPacket(private val serverIP: String, private val qq ...@@ -103,9 +101,7 @@ class ClientServerRedirectionPacket(private val serverIP: String, private val qq
this.writeHex(TIMProtocol.redirectionKey) this.writeHex(TIMProtocol.redirectionKey)
this.write(TEA.encrypt(object : ByteArrayDataOutputStream() { this.encryptAndWrite(TIMProtocol.redirectionKey) {
@Throws(IOException::class)
override fun toByteArray(): ByteArray {
this.writeHex(TIMProtocol.constantData1) this.writeHex(TIMProtocol.constantData1)
this.writeHex(TIMProtocol.constantData2) this.writeHex(TIMProtocol.constantData2)
this.writeQQ(qq) this.writeQQ(qq)
...@@ -113,8 +109,6 @@ class ClientServerRedirectionPacket(private val serverIP: String, private val qq ...@@ -113,8 +109,6 @@ class ClientServerRedirectionPacket(private val serverIP: String, private val qq
this.writeIP(serverIP) this.writeIP(serverIP)
this.writeHex("01 6F A1 58 22 01 00 36 00 12 00 02 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 14 00 1D 01 03 00 19") this.writeHex("01 6F A1 58 22 01 00 36 00 12 00 02 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 14 00 1D 01 03 00 19")
this.writeHex(TIMProtocol.publicKey) this.writeHex(TIMProtocol.publicKey)
return super.toByteArray()
} }
}.toByteArray(), TIMProtocol.redirectionKey.hexToBytes()))
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment