Skip to content

CryptoJS: replace array copies with Kotlin stdlib equivalents #2799

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
+13 −13
Open

CryptoJS: replace array copies with Kotlin stdlib equivalents #2799

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d0001
Remove use of java.util.Arrays
Luna712 May 17, 2026
1109c4c
Remove unused import
Luna712 May 18, 2026
896fc74
Replace more
Luna712 May 18, 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
26 changes: 13 additions & 13 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ package com.lagradost.cloudstream3.extractors.helper

import com.lagradost.cloudstream3.base64DecodeArray
import com.lagradost.cloudstream3.base64Encode
import java.util.Arrays
import java.security.MessageDigest
import java.security.SecureRandom
import javax.crypto.Cipher
import javax.crypto.spec.SecretKeySpec
import javax.crypto.spec.IvParameterSpec
import java.nio.charset.StandardCharsets
import kotlin.math.min

/**
Expand Down Expand Up @@ -48,9 +46,9 @@ object CryptoJS {
// Create CryptoJS-like encrypted!
val sBytes = APPEND.toByteArray()
val b = ByteArray(sBytes.size + saltBytes.size + cipherText.size)
System.arraycopy(sBytes, 0, b, 0, sBytes.size)
System.arraycopy(saltBytes, 0, b, sBytes.size, saltBytes.size)
System.arraycopy(cipherText, 0, b, sBytes.size + saltBytes.size, cipherText.size)
sBytes.copyInto(destination = b, destinationOffset = 0)
saltBytes.copyInto(destination = b, destinationOffset = sBytes.size)
cipherText.copyInto(destination = b, destinationOffset = sBytes.size + saltBytes.size)

return base64Encode(b)
}
Expand All @@ -63,8 +61,8 @@ object CryptoJS {
*/
fun decrypt(password: String, cipherText: String): String {
val ctBytes = base64DecodeArray(cipherText)
val saltBytes = Arrays.copyOfRange(ctBytes, 8, 16)
val cipherTextBytes = Arrays.copyOfRange(ctBytes, 16, ctBytes.size)
val saltBytes = ctBytes.copyOfRange(8, 16)
val cipherTextBytes = ctBytes.copyOfRange(16, ctBytes.size)

val key = ByteArray(KEY_SIZE / 8)
val iv = ByteArray(IV_SIZE / 8)
Expand Down Expand Up @@ -107,16 +105,18 @@ object CryptoJS {
hash.reset()
}

System.arraycopy(
block!!, 0, derivedBytes, numberOfDerivedWords * 4,
min(block.size, (targetKeySize - numberOfDerivedWords) * 4)
block!!.copyInto(
destination = derivedBytes,
destinationOffset = numberOfDerivedWords * 4,
startIndex = 0,
endIndex = min(block.size, (targetKeySize - numberOfDerivedWords) * 4)
)

numberOfDerivedWords += block.size / 4
}

System.arraycopy(derivedBytes, 0, resultKey, 0, keySize * 4)
System.arraycopy(derivedBytes, keySize * 4, resultIv, 0, ivSize * 4)
derivedBytes.copyInto(destination = resultKey, destinationOffset = 0, startIndex = 0, endIndex = keySize * 4)
derivedBytes.copyInto(destination = resultIv, destinationOffset = 0, startIndex = keySize * 4, endIndex = (keySize * 4) + (ivSize * 4))

return derivedBytes // key + iv
}
Expand All @@ -126,4 +126,4 @@ object CryptoJS {
SecureRandom().nextBytes(this)
}
}
}
}