github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-23 14:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small updates

Browse Source
This commit is contained in:
Him188 2019-10-05 13:40:20 +08:00
parent 624d471432
commit 2d825992bb
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt
View File

@ -2,9 +2,9 @@
package net.mamoe.mirai.network.protocol.tim package net.mamoe.mirai.network.protocol.tim
import net.mamoe.mirai.utils.TEA
import net.mamoe.mirai.utils.hexToBytes import net.mamoe.mirai.utils.hexToBytes
import net.mamoe.mirai.utils.lazyDecode import net.mamoe.mirai.utils.toUHexString
import net.mamoe.mirai.utils.readUnsignedVarInt
import java.net.InetAddress import java.net.InetAddress
import java.util.* import java.util.*
import java.util.stream.Collectors 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 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 * 没有任何地方写入了这个 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.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.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 // 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 (?) * 发送/接受消息中的一个const (?)
@ -122,12 +128,4 @@ object TIMProtocol {
.map { value -> value.trim { it <= ' ' } } .map { value -> value.trim { it <= ' ' } }
.map { s -> s.toUByte(16) } .map { s -> s.toUByte(16) }
.collect(Collectors.toList()).toUByteArray() .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())
}
}
} }

1
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt
View File

@ -34,6 +34,7 @@ class ClientPasswordSubmissionPacket(
this.writeHex("00 00 00 10") this.writeHex("00 00 00 10")
this.writeHex(TIMProtocol.key0836) this.writeHex(TIMProtocol.key0836)
//TODO shareKey 极大可能为 publicKey, key0836 计算得到
this.encryptAndWrite(TIMProtocol.shareKey.hexToBytes()) { this.encryptAndWrite(TIMProtocol.shareKey.hexToBytes()) {
writePart1(qq, password, loginTime, loginIP, privateKey, token0825) writePart1(qq, password, loginTime, loginIP, privateKey, token0825)
writePart2() writePart2()