From 033fbc58f9814f23f696c1867d73410b11f8a499 Mon Sep 17 00:00:00 2001 From: MUEDSA <7676275+muedsa@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:33:18 +0800 Subject: [PATCH] update: new aes key --- app/build.gradle.kts | 6 ++++-- .../com/muedsa/agetv/service/AgePlayerService.kt | 2 +- .../muedsa/agetv/service/AgePlayerServiceTest.kt | 14 +++++++++++--- .../test/kotlin/com/muedsa/util/StrCodecKtTest.kt | 13 +++++++++++-- gradle/libs.versions.toml | 2 ++ 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6c8e097..c865fe3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,8 +43,8 @@ android { applicationId = "com.muedsa.agetv" minSdk = 24 targetSdk = 34 - versionCode = 4 - versionName = "0.0.1-alpha04" + versionCode = 5 + versionName = "0.0.1-alpha05" archivesName = "AGETV" } @@ -177,6 +177,8 @@ dependencies { implementation(libs.firebase.crashlytics) //implementation(libs.material.icons.extended) + + testImplementation(libs.bcprov.jdk15to18) } ksp { diff --git a/app/src/main/kotlin/com/muedsa/agetv/service/AgePlayerService.kt b/app/src/main/kotlin/com/muedsa/agetv/service/AgePlayerService.kt index dd1342c..022b468 100644 --- a/app/src/main/kotlin/com/muedsa/agetv/service/AgePlayerService.kt +++ b/app/src/main/kotlin/com/muedsa/agetv/service/AgePlayerService.kt @@ -194,7 +194,7 @@ class AgePlayerService { companion object { private var DEFAULT_RETROFIT: Retrofit? = null private var DEFAULT_VIP_API_SERVICE: AgeVipPlayerApiService? = null - private const val WASM_AES_KEY = "ni po jie ni nb " + private const val WASM_AES_KEY = "ni po jie ni ** " const val TIMEOUT_MS = 10 * 1000 const val SUCCESS_CODE = 200 diff --git a/app/src/test/kotlin/com/muedsa/agetv/service/AgePlayerServiceTest.kt b/app/src/test/kotlin/com/muedsa/agetv/service/AgePlayerServiceTest.kt index 370fe00..07eaed6 100644 --- a/app/src/test/kotlin/com/muedsa/agetv/service/AgePlayerServiceTest.kt +++ b/app/src/test/kotlin/com/muedsa/agetv/service/AgePlayerServiceTest.kt @@ -2,11 +2,19 @@ package com.muedsa.agetv.service import com.muedsa.agetv.exception.AgeParseException import kotlinx.coroutines.runBlocking +import org.bouncycastle.jce.provider.BouncyCastleProvider import org.junit.Test +import java.security.Security class AgePlayerServiceTest { + init { + Security.removeProvider("BC") + // Confirm that positioning this provider at the end works for your needs! + Security.addProvider(BouncyCastleProvider()) + } + private val service = AgePlayerService() // @Test @@ -22,15 +30,15 @@ class AgePlayerServiceTest { @Test fun decryptPlayUrlTest() { runBlocking { - val baseUrl = "https://43.240.74.134:8443/vip/?url=" + val baseUrl = "https://43.240.156.118:8443/vip/?url=" val param = - "age_f382WV3AMFb1D%2FX2k5HO6m%2FjJxWGHSNwtMnyxFFeulNHddlKfzLiFZRY9md2wwxuM8Z%2BfkAchU98L%2BXRCcNRCaFZG9eTMJZODOgSUH8" + "age_533cFgY%2BIyrX8iwo4ALoVsK2DmAm0%2BOIhl%2Bi%2BB409SwC5mONYNo%2BoX%2FFrXC7FduZu719GwSIfKaTPvZRq9aoO40WIA" val playInfo = service.getPlayInfo("$baseUrl$param") println("$playInfo") if (playInfo.vUrl.isEmpty()) { throw AgeParseException("vurl is empty") } - val playUrl = service.decryptPlayUrl(playInfo, "https://43.240.74.134:8443/vip/") + val playUrl = service.decryptPlayUrl(playInfo, "https://43.240.156.118:8443/vip/") println(playUrl) } } diff --git a/app/src/test/kotlin/com/muedsa/util/StrCodecKtTest.kt b/app/src/test/kotlin/com/muedsa/util/StrCodecKtTest.kt index 3903b60..c29c9b7 100644 --- a/app/src/test/kotlin/com/muedsa/util/StrCodecKtTest.kt +++ b/app/src/test/kotlin/com/muedsa/util/StrCodecKtTest.kt @@ -1,13 +1,22 @@ package com.muedsa.util import com.muedsa.uitl.encryptAES128CBCPKCS7 +import org.bouncycastle.jce.provider.BouncyCastleProvider import org.junit.Test +import java.security.Security class StrCodecKtTest { + init { + Security.removeProvider("BC") + // Confirm that positioning this provider at the end works for your needs! + Security.addProvider(BouncyCastleProvider()) + } + + @OptIn(ExperimentalStdlibApi::class) @Test fun decryptPlayUrlTest() { - val key = "ni po jie ni nb " - println("muedsa".encryptAES128CBCPKCS7(key, key)) + val key = "ni po jie ni ** " + println("muedsa".encryptAES128CBCPKCS7(key, key).toHexString()) } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 09cd29b..2d6c4de 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,6 +33,7 @@ retrofit2 = "2.11.0" retrofit2-ktx-serialization = "1.0.0" okhttp3-logging = "4.12.0" room = "2.6.1" +bcprov-jdk15to18 = "1.77" [libraries] core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" } @@ -82,6 +83,7 @@ okhttp3-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor" room = { group = "androidx.room", name = "room-runtime", version.ref = "room" } room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +bcprov-jdk15to18 = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bcprov-jdk15to18" } [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" }