Commit b1d25e05 authored by topjohnwu's avatar topjohnwu

Reuse ALPHANUM

parent 25c55724
...@@ -5,6 +5,7 @@ import android.util.Base64 ...@@ -5,6 +5,7 @@ import android.util.Base64
import android.util.Base64OutputStream import android.util.Base64OutputStream
import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.Config
import com.topjohnwu.magisk.di.koinModules import com.topjohnwu.magisk.di.koinModules
import com.topjohnwu.magisk.utils.PatchAPK.ALPHANUM
import com.topjohnwu.signing.CryptoUtils.readCertificate import com.topjohnwu.signing.CryptoUtils.readCertificate
import com.topjohnwu.signing.CryptoUtils.readPrivateKey import com.topjohnwu.signing.CryptoUtils.readPrivateKey
import com.topjohnwu.superuser.internal.InternalUtils import com.topjohnwu.superuser.internal.InternalUtils
...@@ -38,7 +39,6 @@ class Keygen: CertKeyProvider { ...@@ -38,7 +39,6 @@ class Keygen: CertKeyProvider {
private const val ALIAS = "magisk" private const val ALIAS = "magisk"
private val PASSWORD get() = "magisk".toCharArray() private val PASSWORD get() = "magisk".toCharArray()
private const val TESTKEY_CERT = "61ed377e85d386a8dfee6b864bd85b0bfaa5af81" private const val TESTKEY_CERT = "61ed377e85d386a8dfee6b864bd85b0bfaa5af81"
private const val ALPHANUM = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
private const val BASE64_FLAG = Base64.NO_PADDING or Base64.NO_WRAP private const val BASE64_FLAG = Base64.NO_PADDING or Base64.NO_WRAP
} }
......
...@@ -27,7 +27,7 @@ object PatchAPK { ...@@ -27,7 +27,7 @@ object PatchAPK {
private val UPPERALPHA = LOWERALPHA.toUpperCase() private val UPPERALPHA = LOWERALPHA.toUpperCase()
private val ALPHA = LOWERALPHA + UPPERALPHA private val ALPHA = LOWERALPHA + UPPERALPHA
private const val DIGITS = "0123456789" private const val DIGITS = "0123456789"
private val ALPHANUM = ALPHA + DIGITS val ALPHANUM = ALPHA + DIGITS
private val ALPHANUMDOTS = "$ALPHANUM............" private val ALPHANUMDOTS = "$ALPHANUM............"
private fun genPackageName(prefix: String, length: Int): String { private fun genPackageName(prefix: String, length: Int): String {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment