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

Merge pull request #1966 from olixina/master

Browse Source 
fix(help): fix BadPaddingException: error:1e000065:Cipher functions:OPENSSL_internal:BAD_DECRYPT
pull/1970/head
kunfei 2 years ago committed by GitHub
parent eb01e09cea 73c0c1db16
commit 5c15c58a48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      app/src/main/java/io/legado/app/help/JsExtensions.kt

13
app/src/main/java/io/legado/app/help/JsExtensions.kt
Unescape View File

@ -3,6 +3,7 @@ package io.legado.app.help
import android.net.Uri import android.net.Uri
import android.util.Base64 import android.util.Base64
import androidx.annotation.Keep import androidx.annotation.Keep
import cn.hutool.crypto.SecureUtil
import cn.hutool.crypto.digest.DigestUtil import cn.hutool.crypto.digest.DigestUtil
import cn.hutool.crypto.digest.HMac import cn.hutool.crypto.digest.HMac
import io.legado.app.constant.AppConst import io.legado.app.constant.AppConst
@ -612,7 +613,7 @@ interface JsExtensions {
): ByteArray? { ): ByteArray? {
return try { return try {
EncoderUtils.decryptAES( EncoderUtils.decryptAES(
data = str.encodeToByteArray(), data = SecureUtil.decode(str),
key = key.encodeToByteArray(), key = key.encodeToByteArray(),
transformation, transformation,
iv.encodeToByteArray() iv.encodeToByteArray()
@ -656,7 +657,7 @@ interface JsExtensions {
iv: String iv: String
): String? { ): String? {
return EncoderUtils.decryptAES( return EncoderUtils.decryptAES(
data.encodeToByteArray(), SecureUtil.decode(data),
Base64.decode(key, Base64.NO_WRAP), Base64.decode(key, Base64.NO_WRAP),
"AES/${mode}/${padding}", "AES/${mode}/${padding}",
Base64.decode(iv, Base64.NO_WRAP) Base64.decode(iv, Base64.NO_WRAP)
@ -807,7 +808,7 @@ interface JsExtensions {
data: String, key: String, transformation: String, iv: String data: String, key: String, transformation: String, iv: String
): String? { ): String? {
return EncoderUtils.decryptDES( return EncoderUtils.decryptDES(
data.encodeToByteArray(), SecureUtil.decode(data),
key.encodeToByteArray(), key.encodeToByteArray(),
transformation, transformation,
iv.encodeToByteArray() iv.encodeToByteArray()
@ -818,7 +819,7 @@ interface JsExtensions {
data: String, key: String, transformation: String, iv: String data: String, key: String, transformation: String, iv: String
): String? { ): String? {
return EncoderUtils.decryptBase64DES( return EncoderUtils.decryptBase64DES(
data.encodeToByteArray(), SecureUtil.decode(data),
key.encodeToByteArray(), key.encodeToByteArray(),
transformation, transformation,
iv.encodeToByteArray() iv.encodeToByteArray()
@ -866,7 +867,7 @@ interface JsExtensions {
iv: String iv: String
): String? { ): String? {
return EncoderUtils.decryptDESede( return EncoderUtils.decryptDESede(
data.encodeToByteArray(), SecureUtil.decode(data),
key.encodeToByteArray(), key.encodeToByteArray(),
"DESede/${mode}/${padding}", "DESede/${mode}/${padding}",
iv.encodeToByteArray() iv.encodeToByteArray()
@ -891,7 +892,7 @@ interface JsExtensions {
iv: String iv: String
): String? { ): String? {
return EncoderUtils.decryptDESede( return EncoderUtils.decryptDESede(
data.encodeToByteArray(), SecureUtil.decode(data),
Base64.decode(key, Base64.NO_WRAP), Base64.decode(key, Base64.NO_WRAP),
"DESede/${mode}/${padding}", "DESede/${mode}/${padding}",
Base64.decode(iv, Base64.NO_WRAP) Base64.decode(iv, Base64.NO_WRAP)

Write Preview
Loading…
Cancel
Save