Skip to content

M3u8Helper: add new suspended getDecryptedBytes() #3051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luna712 wants to merge 3 commits into
base: master
Choose a base branch
from
+23 −2
Open

M3u8Helper: add new suspended getDecryptedBytes() #3051

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d83d360
M3u8Helper: make getDecrypted() suspend
Luna712 Jul 10, 2026
52b6eeb
Use getDecryptedBytes for the new version
Luna712 Jul 11, 2026
226f7c8
Add commented wrapper
Luna712 Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.utils

import com.lagradost.api.Log
import com.lagradost.cloudstream3.ErrorLoadingException
import com.lagradost.cloudstream3.Prerelease
import com.lagradost.cloudstream3.app
import dev.whyoleg.cryptography.CryptographyProvider
import dev.whyoleg.cryptography.DelicateCryptographyApi
Expand All @@ -25,7 +26,6 @@ class M3u8Helper {
}
}


data class M3u8Stream(
val streamUrl: String,
val quality: Int? = null,
Expand Down Expand Up @@ -99,13 +99,34 @@ object M3u8Helper2 {
return toBytes16Big(index + 1)
}

@OptIn(DelicateCryptographyApi::class)
@Prerelease
suspend fun getDecryptedBytes(
secretKey: ByteArray,
data: ByteArray,
iv: ByteArray = byteArrayOf(),
index: Int,
): ByteArray {
val ivKey = if (iv.isEmpty()) defaultIv(index) else iv
val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, secretKey)
return aesKey.cipher(padding = true).decryptWithIv(ivKey, data)
}

// Deprecate after next stable
/* @Deprecated(
message = "Renamed to getDecryptedBytes",
replaceWith = ReplaceWith("getDecryptedBytes(secretKey, data, iv, index)"),
level = DeprecationLevel.WARNING,
) */
@OptIn(DelicateCryptographyApi::class)
fun getDecrypted(
secretKey: ByteArray,
data: ByteArray,
iv: ByteArray = byteArrayOf(),
index: Int,
): ByteArray {
// After next stable, we can just make this a wrapper
// return runBlocking { getDecryptedBytes(secretKey, data, iv, index) }
val ivKey = if (iv.isEmpty()) defaultIv(index) else iv
val aesKey = aesCbc.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, secretKey)
return aesKey.cipher(padding = true).decryptWithIvBlocking(ivKey, data)
Expand Down Expand Up @@ -239,7 +260,7 @@ object M3u8Helper2 {
if (tsData.size < 128 && tsData.all { it >= 0 }) throw ErrorLoadingException("ASCII found instead of data")

return if (isEncrypted) {
getDecrypted(encryptionData, tsData, encryptionIv, index)
getDecryptedBytes(encryptionData, tsData, encryptionIv, index)
} else {
tsData
}
Expand Down