Skip to content

M3u8Helper: make getDecrypted() suspend #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

Draft
Luna712 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Draft

M3u8Helper: make getDecrypted() suspend #3051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 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 @@ -100,15 +100,15 @@ object M3u8Helper2 {
}

@OptIn(DelicateCryptographyApi::class)
fun getDecrypted(
suspend fun getDecrypted(

@fire-light42 fire-light42 Jul 10, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the ABI, contrary to expectations.

@Luna712 Luna712 Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I know and forgot to add a PR description (the whole reason I just opened this PR lol). What I wanted was some opinion on how not to do that while still doing a suspended version of this.

@fire-light42 fire-light42 Jul 10, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know of no good way beyond the standard deprecation method 😕

@Luna712 Luna712 Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay I will figure something out later then lol. Thanks for the comment though.

@Luna712 Luna712 Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am marking this as a draft until then.

secretKey: ByteArray,
data: ByteArray,
iv: ByteArray = byteArrayOf(),
index: Int,
): ByteArray {
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)
val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, secretKey)
return aesKey.cipher(padding = true).decryptWithIv(ivKey, data)
}

private fun getParentLink(url: String): String {
Expand Down