[core] optimize crypto

mamoe · Him188 · May 21, 2023 · Apr 8, 2023 · Apr 9, 2023 · Apr 9, 2023
commit 153082f0a5e0e8c875a5f772889542bdd6c56c1a
diff --git a/mirai-core/src/androidMain/kotlin/utils/crypto/RSAAndroid.kt b/mirai-core/src/androidMain/kotlin/utils/crypto/RSAAndroid.kt
@@ -18,8 +18,8 @@ import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.X509EncodedKeySpec
 import javax.crypto.Cipher
 
-internal actual fun rsaEncryptWithX509PubKey(input: ByteArray, pubPemKey: ByteArray, seed: Long): ByteArray {
-    val encodedKey = pubPemKey.decodeToString()
+internal actual fun rsaEncryptWithX509PubKey(input: ByteArray, plainPubPemKey: String, seed: Long): ByteArray {
+    val encodedKey = plainPubPemKey
         .replace("\n", "")
         .removePrefix("-----BEGIN PUBLIC KEY-----")
         .removeSuffix("-----END PUBLIC KEY-----")
@@ -36,8 +36,8 @@ internal actual fun rsaEncryptWithX509PubKey(input: ByteArray, pubPemKey: ByteAr
     return cipher.doFinal(input)
 }
 
-internal actual fun rsaDecryptWithPKCS8PrivKey(input: ByteArray, privPemKey: ByteArray, seed: Long): ByteArray {
-    val encodedKey = privPemKey.decodeToString()
+internal actual fun rsaDecryptWithPKCS8PrivKey(input: ByteArray, plainPrivPemKey: String, seed: Long): ByteArray {
+    val encodedKey = plainPrivPemKey
         .replace("\n", "")
         .removePrefix("-----BEGIN PRIVATE KEY-----")
         .removeSuffix("-----END PRIVATE KEY-----")
@@ -60,15 +60,15 @@ internal actual fun generateRSAKeyPair(keySize: Int): RSAKeyPair {
 
     val keyPair = keyGen.generateKeyPair()
     return RSAKeyPair(
-        pubPemKey = buildString {
+        plainPubPemKey = buildString {
             appendLine("-----BEGIN PUBLIC KEY-----")
             keyPair.public.encoded.encodeBase64().chunked(64).forEach(::appendLine)
             appendLine("-----END PUBLIC KEY-----")
-        }.encodeToByteArray(),
-        privPemKey = buildString {
+        },
+        plainPrivPemKey = buildString {
             appendLine("-----BEGIN PRIVATE KEY-----")
             keyPair.private.encoded.encodeBase64().chunked(64).forEach(::appendLine)
             appendLine("-----END PRIVATE KEY-----")
-        }.encodeToByteArray()
+        }
     )
 }
diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin24.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin24.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2019-2023 Mamoe Technologies and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/mamoe/mirai/blob/dev/LICENSE
+ */
+
+package net.mamoe.mirai.internal.network.protocol.packet.login.wtlogin
+
+import io.ktor.utils.io.core.*
+import net.mamoe.mirai.internal.network.*
+import net.mamoe.mirai.internal.network.protocol.packet.*
+import net.mamoe.mirai.internal.network.protocol.packet.login.WtLogin
+import net.mamoe.mirai.internal.utils.GuidSource
+import net.mamoe.mirai.internal.utils.MacOrAndroidIdChangeFlag
+import net.mamoe.mirai.internal.utils.guidFlag
+import net.mamoe.mirai.utils._writeTlvMap
+import net.mamoe.mirai.utils.generateDeviceInfoData
+
+internal object WtLogin24 : WtLoginExt {
+    private val appId = 16L
+
+    operator fun invoke(
+        client: QQAndroidClient,
+        isSmsLogin: Boolean,
+    ): OutgoingPacketWithRespType<WtLogin.Login.LoginPacketResponse> {
+        return WtLogin.Login.buildLoginOutgoingPacket(
+            client,
+            bodyType = 2,
+            remark = "24:get-salt-uin-list",
+        ) { sequenceId ->
+            writeSsoPacket(client, client.subAppId, WtLogin.Login.commandName, sequenceId = sequenceId) {
+                writeOicqRequestPacket(client, uin = 0, commandId = 0x0810) {
+                    writeShort(24)
+                    _writeTlvMap {
+                        t8()
+                        t18(appId, client.appClientVersion, 0, 0)
+                        t100(appId, client.subAppId, client.appClientVersion, client.ssoVersion, client.mainSigMap)
+
+                        t104(client.t104)
+
+                        t108(client.ksid)
+                        t109(client.device.androidId)
+                        t116(client.miscBitMap, client.subSigMap)
+                        tlv(0x11b) { writeByte(2) }
+                        t124(
+                            osType = client.device.osType,
+                            osVersion = client.device.version.release,
+                            networkType = client.networkType,
+                            simInfo = client.device.simInfo,
+                            address = byteArrayOf(),
+                            apn = client.device.apn,
+                        )
+                        t128(
+                            isGuidFromFileNull = false,
+                            isGuidAvailable = true,
+                            isGuidChanged = false,
+                            guidFlag = guidFlag(GuidSource.FROM_STORAGE, MacOrAndroidIdChangeFlag(0)),
+                            buildModel = client.device.model,
+                            guid = client.device.guid,
+                            buildBrand = client.device.brand,
+                        )
+
+                        t142(client.apkId)
+                        t145(client.device.guid)
+                        t147(appId, client.apkVersionName, client.apkSignatureMd5)
+
+                        t154(sequenceId)
+                        t16e(client.device.model)
+
+                        client.rollbackSig?.let { t172(it) }
+
+                        t177(client.buildTime, client.sdkVersion)
+                        t202(client.device.wifiBSSID, client.device.wifiSSID)
+
+                        t400(
+                            g = client.G,
+                            uin = 0,
+                            guid = client.device.guid,
+                            dpwd = client.dpwd,
+                            appId = 1,
+                            subAppId = 16,
+                            randomSeed = client.randSeed
+                        )
+
+                        t521()
+                        t525(client.loginExtraData)
+                        t52d(client.device.generateDeviceInfoData())
+                        t544() // TODO
+                        // ignored cuz qiemiListener is null
+                        // tlv(0x545) {  }
+                        //tlv(0x548) { writeFully(powTestData) }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/mirai-core/src/commonMain/kotlin/utils/crypto/RSA.kt b/mirai-core/src/commonMain/kotlin/utils/crypto/RSA.kt
@@ -9,29 +9,13 @@
 
 package net.mamoe.mirai.internal.utils.crypto
 
-internal data class RSAKeyPair(
-    val pubPemKey: ByteArray,
-    val privPemKey: ByteArray
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || this::class != other::class) return false
-
-        other as RSAKeyPair
-
-        if (!pubPemKey.contentEquals(other.pubPemKey)) return false
-        return privPemKey.contentEquals(other.privPemKey)
-    }
-
-    override fun hashCode(): Int {
-        var result = pubPemKey.contentHashCode()
-        result = 31 * result + privPemKey.contentHashCode()
-        return result
-    }
-}
+internal class RSAKeyPair(
+    val plainPubPemKey: String,
+    val plainPrivPemKey: String
+)
 
 internal expect fun generateRSAKeyPair(keySize: Int): RSAKeyPair
 
-internal expect fun rsaEncryptWithX509PubKey(input: ByteArray, pubPemKey: ByteArray, seed: Long): ByteArray
+internal expect fun rsaEncryptWithX509PubKey(input: ByteArray, plainPubPemKey: String, seed: Long): ByteArray
 
-internal expect fun rsaDecryptWithPKCS8PrivKey(input: ByteArray, privPemKey: ByteArray, seed: Long): ByteArray
+internal expect fun rsaDecryptWithPKCS8PrivKey(input: ByteArray, plainPrivPemKey: String, seed: Long): ByteArray
diff --git a/mirai-core/src/commonTest/kotlin/utils/crypto/RSATest.kt b/mirai-core/src/commonTest/kotlin/utils/crypto/RSATest.kt
@@ -9,45 +9,41 @@
 
 package net.mamoe.mirai.internal.utils.crypto
 
-import net.mamoe.mirai.utils.currentTimeMillis
-import net.mamoe.mirai.utils.toUHexString
-import kotlin.random.Random
+import kotlin.math.pow
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class RSATest {
     @Test
     fun `can gen rsa key pair`() {
-        val rsaKeyPair = generateRSAKeyPair(2048)
-        println(rsaKeyPair.pubPemKey.decodeToString())
-        println(rsaKeyPair.privPemKey.decodeToString())
+        repeat(4) { exp ->
+            val keySize = 2.0.pow(9 + exp).toInt()
+            val rsaKeyPair = generateRSAKeyPair(keySize)
+            println("RSA keygen test #${exp + 1}: keySize = $keySize")
+            println(rsaKeyPair.plainPubPemKey)
+            println(rsaKeyPair.plainPrivPemKey)
+        }
     }
 
     @Test
     fun `can do crypto with generated key`() {
+        val keyPair = generateRSAKeyPair(2048)
 
-        val random = Random(currentTimeMillis())
-        repeat(5) {
-            val keyPair = generateRSAKeyPair(2048)
-            val currentTime = currentTimeMillis()
-
-            val plainText = buildString {
-                append("Use of this source code is governed by the GNU AGPLv3 license ")
-                append(currentTime)
-            }
+        val plainText = buildString {
+            append("Use of this source code is governed by the GNU AGPLv3 license ")
+            append("that can be found through the following link. ")
+        }
 
-            println(
-                "RSA crypto test #${it + 1}: pubKey = ${keyPair.pubPemKey.decodeToString()}, " +
-                        "privKey = ${keyPair.privPemKey.decodeToString()}, currentTimeMillis = $currentTime"
-            )
-            val enc =
-                rsaEncryptWithX509PubKey(plainText.encodeToByteArray(), keyPair.pubPemKey, random.nextLong(currentTime))
-            println("rsa encrypt: data=${enc.toUHexString()}")
-            val decrypted = rsaDecryptWithPKCS8PrivKey(enc, keyPair.privPemKey, random.nextLong(currentTime))
-            println("rsa decrypt: data=${decrypted.toUHexString()}")
+        println(
+            "RSA crypto test: plainTextLength: ${plainText.length}, " +
+                    "pubKey = ${keyPair.plainPubPemKey}, " +
+                    "privKey = ${keyPair.plainPrivPemKey}"
+        )
+        val enc = rsaEncryptWithX509PubKey(plainText.encodeToByteArray(), keyPair.plainPubPemKey, 0)
+        println("rsa encrypt: data size=${enc.size}")
+        val decrypted = rsaDecryptWithPKCS8PrivKey(enc, keyPair.plainPrivPemKey, 0)
 
-            assertEquals(plainText, decrypted.decodeToString())
-        }
+        assertEquals(plainText, decrypted.decodeToString())
     }
 
     @Test
@@ -62,7 +58,7 @@ KP1dfqZ3PrK8QBH6su0GlB8onYFtzDUckr2wCrrJ1cR4L1Dg5f2egE75l1cliAIM
 eU8vpIlLP/9W5nkdqF6CWzjE3dIx2btOH4QDDyogDSLRAvcKN5/1EIZeu2FTbw9k
 3QIDAQAB
 -----END PUBLIC KEY-----
-        """.trimIndent().encodeToByteArray()
+        """.trimIndent()
 
         val privKey = """
 -----BEGIN PRIVATE KEY-----
@@ -93,7 +89,7 @@ rz6d6RB+i1Q7ExBK7lbZxN17HmKiOewwI772zEo28IY9sIHugV7rW1vQVs3bnzgk
 ExDGjYWZSKHfs+3mvrLNRIx/IsVqqwlXt5oO9TspSh68ASvmXN51dmduxRrSuScq
 8a49uOr675SyFCJTIdF/Ag==
 -----END PRIVATE KEY-----
-""".trimIndent().encodeToByteArray()
+""".trimIndent()
 
         val plainText = buildString {
             append("Use of this source code is governed by the GNU AGPLv3 license ")

diff --git a/mirai-core/src/jvmMain/kotlin/utils/crypto/RSAJvm.kt b/mirai-core/src/jvmMain/kotlin/utils/crypto/RSAJvm.kt
@@ -18,9 +18,8 @@ import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.X509EncodedKeySpec
 import javax.crypto.Cipher
 
-
-internal actual fun rsaEncryptWithX509PubKey(input: ByteArray, pubPemKey: ByteArray, seed: Long): ByteArray {
-    val encodedKey = pubPemKey.decodeToString()
+internal actual fun rsaEncryptWithX509PubKey(input: ByteArray, plainPubPemKey: String, seed: Long): ByteArray {
+    val encodedKey = plainPubPemKey
         .replace("\n", "")
         .removePrefix("-----BEGIN PUBLIC KEY-----")
         .removeSuffix("-----END PUBLIC KEY-----")
@@ -37,8 +36,8 @@ internal actual fun rsaEncryptWithX509PubKey(input: ByteArray, pubPemKey: ByteAr
     return cipher.doFinal(input)
 }
 
-internal actual fun rsaDecryptWithPKCS8PrivKey(input: ByteArray, privPemKey: ByteArray, seed: Long): ByteArray {
-    val encodedKey = privPemKey.decodeToString()
+internal actual fun rsaDecryptWithPKCS8PrivKey(input: ByteArray, plainPrivPemKey: String, seed: Long): ByteArray {
+    val encodedKey = plainPrivPemKey
         .replace("\n", "")
         .removePrefix("-----BEGIN PRIVATE KEY-----")
         .removeSuffix("-----END PRIVATE KEY-----")
@@ -61,15 +60,15 @@ internal actual fun generateRSAKeyPair(keySize: Int): RSAKeyPair {
 
     val keyPair = keyGen.generateKeyPair()
     return RSAKeyPair(
-        pubPemKey = buildString {
+        plainPubPemKey = buildString {
             appendLine("-----BEGIN PUBLIC KEY-----")
             keyPair.public.encoded.encodeBase64().chunked(64).forEach(::appendLine)
             appendLine("-----END PUBLIC KEY-----")
-        }.encodeToByteArray(),
-        privPemKey = buildString {
+        },
+        plainPrivPemKey = buildString {
             appendLine("-----BEGIN PRIVATE KEY-----")
             keyPair.private.encoded.encodeBase64().chunked(64).forEach(::appendLine)
             appendLine("-----END PRIVATE KEY-----")
-        }.encodeToByteArray()
+        }
     )
 }