diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt index afb353be8..2b6cb617a 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt @@ -87,7 +87,7 @@ class Robot(val number: Int, private val password: String) { } - is ServerLoginResponseSucceedPacket -> { + is ServerLoginResponseSuccessPacket -> { this._0828_rec_decr_key = packet._0828_rec_decr_key sendPacket(ClientLoginSucceedConfirmationPacket(this.number, this.serverIP, this.md5_32, packet.token38, packet.token88, packet.encryptionKey, this.tlv0105)) } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSucceedPacket.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSuccessPacket.kt similarity index 92% rename from mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSucceedPacket.kt rename to mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSuccessPacket.kt index 6f02496c8..e0f8290f4 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSucceedPacket.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSuccessPacket.kt @@ -12,7 +12,7 @@ import java.io.DataInputStream * @author Him188moe @ Mirai Project * @author NaturalHG @ Mirai Project */ -class ServerLoginResponseSucceedPacket(input: DataInputStream) : ServerPacket(input) { +class ServerLoginResponseSuccessPacket(input: DataInputStream) : ServerPacket(input) { lateinit var _0828_rec_decr_key: ByteArray var age: Int = 0 var gender: Boolean = false//from 1byte @@ -54,9 +54,9 @@ class ServerLoginResponseSucceedPacketEncrypted(input: DataInputStream) : Server } @ExperimentalUnsignedTypes - fun decrypt(tgtgtKey: ByteArray): ServerLoginResponseSucceedPacket {//todo test + fun decrypt(tgtgtKey: ByteArray): ServerLoginResponseSuccessPacket {//todo test this.input.skip(14) - return ServerLoginResponseSucceedPacket(TEACryptor.decrypt(TEACryptor.decrypt(this.input.readAllBytes().let { it.copyOfRange(0, it.size - 1) }, Protocol.shareKey.hexToBytes()), tgtgtKey).dataInputStream()); + return ServerLoginResponseSuccessPacket(TEACryptor.decrypt(TEACryptor.decrypt(this.input.readAllBytes().let { it.copyOfRange(0, it.size - 1) }, Protocol.shareKey.hexToBytes()), tgtgtKey).dataInputStream()); //TeaDecrypt(取文本中间(data, 43, 取文本长度(data) - 45), m_0828_rec_decr_key) } }