YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Xwite
2023-03-15 10:35:04 +08:00
parent 16f9cb0969
commit 5e5b7683d3
3 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/assets/help/jsHelp.md
+10 -6
View File
@@ -215,15 +215,19 @@ java.createAsymmetricCrypto(transformation)
``` ```
> 解密加密参数 data支持ByteArray|Base64String|HexString|InputStream > 解密加密参数 data支持ByteArray|Base64String|HexString|InputStream
> usePublicKey: true 使用公钥 false 使用私钥
``` ```
//解密为ByteArray String //解密为ByteArray String
cipher.decrypt(data, usePublicKey) cipher.decrypt(data, usePublicKey: Boolean? = true
cipher.decryptStr(data, usePublicKey) )
cipher.decryptStr(data, usePublicKey: Boolean? = true
)
//加密为ByteArray Base64字符 HEX字符 //加密为ByteArray Base64字符 HEX字符
cipher.encrypt(data, usePublicKey) cipher.encrypt(data, usePublicKey: Boolean? = true
cipher.encryptBase64(data, usePublicKey) )
cipher.encryptHex(data, usePublicKey) cipher.encryptBase64(data, usePublicKey: Boolean? = true
)
cipher.encryptHex(data, usePublicKey: Boolean? = true
)
``` ```
* 签名 * 签名
> 输入参数 key 支持ByteArray|**Utf8String** > 输入参数 key 支持ByteArray|**Utf8String**
app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt
+46 -18
View File
@@ -23,33 +23,61 @@ class AsymmetricCrypto(algorithm: String) : HutoolAsymmetricCrypto(algorithm) {
} }
fun setPublicKey(key: String): AsymmetricCrypto = setPublicKey(key.encodeToByteArray()) fun setPublicKey(key: String): AsymmetricCrypto = setPublicKey(key.encodeToByteArray())
private fun getKeyType(usePublicKey: Boolean): KeyType { private fun getKeyType(usePublicKey: Boolean? = true): KeyType {
return when { return when {
usePublicKey == true -> KeyType.PublicKey usePublicKey == true -> KeyType.PublicKey
else -> KeyType.PrivateKey else -> KeyType.PrivateKey
} }
} }
fun decrypt(data: ByteArray, usePublicKey: Boolean): ByteArray = decrypt(data, getKeyType(usePublicKey)) @JvmOverloads
fun decrypt(data: String, usePublicKey: Boolean): ByteArray = decrypt(data, getKeyType(usePublicKeye)) fun decrypt(data: Any, usePublicKey: Boolean? = true): ByteArray {
fun decrypt(data: InputStream, usePublicKey: Boolean): ByteArray = decrypt(data, getKeyType(usePublicKey)) return {
data is ByteArray -> decrypt(data, getKeyType(usePublicKey))
data is String -> decrypt(data, getKeyType(usePublicKey))
data is InputStream -> decrypt(data, getKeyType(usePublicKey))
else -> throw IllegalArgumentException("Unexpected input type")
}
}
fun decryptStr(data: ByteArray, usePublicKey: Boolean): String = decryptStr(data, getKeyType(usePublicKey)) @JvmOverloads
fun decryptStr(data: String, usePublicKey: Boolean): String = decryptStr(data, getKeyType(usePublicKey)) fun decryptStr(data: Any, usePublicKey: Boolean? = true): String {
fun decryptStr(data: InputStream, usePublicKey: Boolean): String = decryptStr(data, getKeyType(usePublicKey)) return {
data is ByteArray -> decryptStr(data, getKeyType(usePublicKey))
data is String -> decryptStr(data, getKeyType(usePublicKey))
data is InputStream -> decryptStr(data, getKeyType(usePublicKey))
else -> throw IllegalArgumentException("Unexpected input type")
}
}
fun encrypt(data: ByteArray, usePublicKey: Boolean): ByteArray = encrypt(data, getKeyType(usePublicKey)) @JvmOverloads
fun encrypt(data: String, usePublicKey: Boolean): ByteArray = encrypt(data, getKeyType(usePublicKey)) fun encrypt(data: Any, usePublicKey: Boolean? = true): ByteArray {
fun encrypt(data: InputStream, usePublicKey: Boolean): ByteArray = encrypt(data, getKeyType(usePublicKey)) return {
data is ByteArray -> encrypt(data, getKeyType(usePublicKey))
fun encryptHex(data: ByteArray, usePublicKey: Boolean): String = encryptHex(data, getKeyType(usePublicKey)) data is String -> encrypt(data, getKeyType(usePublicKey))
fun encryptHex(data: String, usePublicKey: Boolean): String = encryptHex(data, getKeyType(usePublicKey)) data is InputStream -> encrypt(data, getKeyType(usePublicKey))
fun encryptHex(data: InputStream, usePublicKey: Boolean): String = encryptHex(data, getKeyType(usePublicKey)) else -> throw IllegalArgumentException("Unexpected input type")
}
fun encryptBase64(data: ByteArray, usePublicKey: Boolean): String =encryptBase64(data, getKeyType(usePublicKey)) }
fun encryptBase64(data: String, usePublicKey: Boolean): String =encryptBase64(data, getKeyType(usePublicKey))
fun encryptBase64(data: InputStream, usePublicKey: Boolean): String =encryptBase64(data, getKeyType(usePublicKey))
@JvmOverloads
fun encryptHex(data: Any, usePublicKey: Boolean? = true): String {
return {
data is ByteArray -> encryptHex(data, getKeyType(usePublicKey))
data is String -> encryptHex(data, getKeyType(usePublicKey))
data is InputStream -> encryptHex(data, getKeyType(usePublicKey))
else -> throw IllegalArgumentException("Unexpected input type")
}
}
@JvmOverloads
fun encryptBase64(data: Any, usePublicKey: Boolean? = true): String {
return {
data is ByteArray -> encryptBase64(data, getKeyType(usePublicKey))
data is String -> encryptBase64(data, getKeyType(usePublicKey))
data is InputStream -> encryptBase64(data, getKeyType(usePublicKey))
else -> throw IllegalArgumentException("Unexpected input type")
}
}
} }
app/src/main/java/io/legado/app/help/crypto/README.md
+5 -5
View File
@@ -7,10 +7,10 @@ fun setPublicKey(key: String): T
fun setPrivateKey(key: ByteArray): T fun setPrivateKey(key: ByteArray): T
fun setPrivateKey(key: String): T fun setPrivateKey(key: String): T
fun decrypt(data: Any, keyType: Int): ByteArray? fun decrypt(data: Any, usePublicKey: Boolean? = true): ByteArray?
fun decryptStr(data: Any, keyType: Int): String? fun decryptStr(data: Any, usePublicKey: Boolean? = true): String?
fun encrypt(data: Any, keyType: Int): ByteArray? fun encrypt(data: Any, usePublicKey: Boolean? = true): ByteArray?
fun encryptHex(data: Any, keyType: Int): String? fun encryptHex(data: Any, usePublicKey: Boolean? = true): String?
fun encryptBase64(data: Any, keyType: Int): String? fun encryptBase64(data: Any, usePublicKey: Boolean? = true): String?
``` ```