From 3c840f5a55e8a43049631809e29b8e379cb73b3c Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 23 Jun 2022 08:02:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/help/JsExtensions.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt index 54788b6e3..a7c4f3927 100644 --- a/app/src/main/java/io/legado/app/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -3,7 +3,6 @@ package io.legado.app.help import android.net.Uri import android.util.Base64 import androidx.annotation.Keep -import cn.hutool.crypto.SecureUtil import cn.hutool.crypto.digest.DigestUtil import cn.hutool.crypto.digest.HMac import io.legado.app.constant.AppConst @@ -11,7 +10,10 @@ import io.legado.app.constant.AppConst.dateFormat import io.legado.app.constant.AppLog import io.legado.app.data.entities.BaseSource import io.legado.app.exception.NoStackTraceException -import io.legado.app.help.http.* +import io.legado.app.help.http.BackstageWebView +import io.legado.app.help.http.CookieStore +import io.legado.app.help.http.SSLHelper +import io.legado.app.help.http.StrResponse import io.legado.app.model.Debug import io.legado.app.model.analyzeRule.AnalyzeUrl import io.legado.app.model.analyzeRule.QueryTTF @@ -613,7 +615,7 @@ interface JsExtensions { ): ByteArray? { return try { EncoderUtils.decryptAES( - data = SecureUtil.decode(str), + data = str.encodeToByteArray(), key = key.encodeToByteArray(), transformation, iv.encodeToByteArray() @@ -657,7 +659,7 @@ interface JsExtensions { iv: String ): String? { return EncoderUtils.decryptAES( - SecureUtil.decode(data), + data.encodeToByteArray(), Base64.decode(key, Base64.NO_WRAP), "AES/${mode}/${padding}", Base64.decode(iv, Base64.NO_WRAP) @@ -808,7 +810,7 @@ interface JsExtensions { data: String, key: String, transformation: String, iv: String ): String? { return EncoderUtils.decryptDES( - SecureUtil.decode(data), + data.encodeToByteArray(), key.encodeToByteArray(), transformation, iv.encodeToByteArray() @@ -819,7 +821,7 @@ interface JsExtensions { data: String, key: String, transformation: String, iv: String ): String? { return EncoderUtils.decryptBase64DES( - SecureUtil.decode(data), + data.encodeToByteArray(), key.encodeToByteArray(), transformation, iv.encodeToByteArray() @@ -867,7 +869,7 @@ interface JsExtensions { iv: String ): String? { return EncoderUtils.decryptDESede( - SecureUtil.decode(data), + data.encodeToByteArray(), key.encodeToByteArray(), "DESede/${mode}/${padding}", iv.encodeToByteArray() @@ -892,7 +894,7 @@ interface JsExtensions { iv: String ): String? { return EncoderUtils.decryptDESede( - SecureUtil.decode(data), + data.encodeToByteArray(), Base64.decode(key, Base64.NO_WRAP), "DESede/${mode}/${padding}", Base64.decode(iv, Base64.NO_WRAP)