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

Fix #1405, before it is a compiler undefined behavior (#1408)

Browse Source
This commit is contained in:
sandtechnology 2021-07-11 10:07:41 +08:00 committed by GitHub
parent 2c3f686315
commit b2d6e7423a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt
View File

@ -209,11 +209,12 @@ internal class PacketCodecImpl : PacketCodec {
(client as QQAndroidClient).bot.components[EcdhInitialPublicKeyUpdater].getECDHWithPublicKey()
return when (encryptionMethod) {
4 -> {
val size = (this.remaining - 1).toInt()
val data =
TEA.decrypt(
this.readBytes(),
ecdhWithPublicKey.keyPair.maskedShareKey,
length = (this.remaining - 1).toInt()
length = size
)
val peerShareKey =
@ -221,11 +222,12 @@ internal class PacketCodecImpl : PacketCodec {
TEA.decrypt(data, peerShareKey)
}
3 -> {
val size = (this.remaining - 1).toInt();
// session
TEA.decrypt(
this.readBytes(),
client.wLoginSigInfo.wtSessionTicketKey,
length = (this.remaining - 1).toInt()
length = size
)
}
0 -> {
@ -239,7 +241,8 @@ internal class PacketCodecImpl : PacketCodec {
TEA.decrypt(byteArrayBuffer, client.randomKey, length = size)
}
} else {
TEA.decrypt(this.readBytes(), client.randomKey, length = (this.remaining - 1).toInt())
val size = (this.remaining - 1).toInt()
TEA.decrypt(this.readBytes(), client.randomKey, length = size)
}
}
else -> error("Illegal encryption method. expected 0 or 4, got $encryptionMethod")