From 2d825992bbe8b842a26a90784d2a5736bc4eafd5 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 5 Oct 2019 13:40:20 +0800
Subject: [PATCH] Small updates
---
.../mirai/network/protocol/tim/TIMProtocol.kt | 30 +++++++++----------
.../protocol/tim/packet/login/ClientLogin.kt | 1 +
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt
index 467fa7f42..8530daec4 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt
@@ -2,9 +2,9 @@
package net.mamoe.mirai.network.protocol.tim
+import net.mamoe.mirai.utils.TEA
import net.mamoe.mirai.utils.hexToBytes
-import net.mamoe.mirai.utils.lazyDecode
-import net.mamoe.mirai.utils.readUnsignedVarInt
+import net.mamoe.mirai.utils.toUHexString
import java.net.InetAddress
import java.util.*
import java.util.stream.Collectors
@@ -66,6 +66,18 @@ object TIMProtocol {
*/
const val publicKey = "02 6D 28 41 D2 A5 6F D2 FC 3E 2A 1F 03 75 DE 6E 28 8F A8 19 3E 5F 16 49 D3"//25
+ /**
+ * fix_0836_1
+ *
+ * LoginResend 和 PasswordSubmission 时写入, 但随后都使用 shareKey 加密, 收到回复也是用的 share key
+ */
+ const val key0836 = "EF 4A 36 6A 16 A8 E6 3D 2E EA BD 1F 98 C1 3C DA"//16
+
+ @JvmStatic
+ fun main(args: Array<String>) {
+ println(TEA.decrypt(publicKey.hexToBytes(), key0836).toUHexString())
+ }
+
/**
* 没有任何地方写入了这个 key
*/
@@ -87,12 +99,6 @@ object TIMProtocol {
// 1.0.4 03 00 00 00 01 2E 01 00 00 68 27 00 00 00 00 00 02 01 03
// 1.1 03 00 00 00 01 2E 01 00 00 68 3F 00 00 00 00 00 02 01 03
// 1.2 03 00 00 00 01 2E 01 00 00 68 44 00 00 00 00 00 02 01 03
- /**
- * fix_0836_1
- *
- * LoginResend 和 PasswordSubmission 时写入, 但随后都使用 shareKey 加密, 收到回复也是用的 share key
- */
- const val key0836 = "EF 4A 36 6A 16 A8 E6 3D 2E EA BD 1F 98 C1 3C DA"//16
/**
* 发送/接受消息中的一个const (?)
@@ -122,12 +128,4 @@ object TIMProtocol {
.map { value -> value.trim { it <= ' ' } }
.map { s -> s.toUByte(16) }
.collect(Collectors.toList()).toUByteArray()
-
- @JvmStatic
- fun main(args: Array<String>) {
- lazyDecode("03 00 00 00 01 01 01 00 00 68 20 00 00 00 00 00 01 01 03".hexToBytes()) {
- it.skip(7)
- println(it.readUnsignedVarInt())
- }
- }
}
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt
index e685f9835..d6b12e67d 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt
@@ -34,6 +34,7 @@ class ClientPasswordSubmissionPacket(
this.writeHex("00 00 00 10")
this.writeHex(TIMProtocol.key0836)
+ //TODO shareKey 极大可能为 publicKey, key0836 计算得到
this.encryptAndWrite(TIMProtocol.shareKey.hexToBytes()) {
writePart1(qq, password, loginTime, loginIP, privateKey, token0825)
writePart2()