korlibs · soywiz · Dec 28, 2023 · Dec 19, 2023 · Dec 27, 2023 · Dec 27, 2023
diff --git a/korge-foundation/build.gradle.kts b/korge-foundation/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     //add("commonTestApi", project(":korge-test"))
     commonTestApi(libs.kotlinx.coroutines.test)
     commonMainApi(project(":korlibs-time"))
+    commonMainApi(project(":korlibs-crypto"))
 }
 
 //korlibs.korge.gradle.generate.TemplateGenerator.synchronize(new File(projectDir, "template"))

diff --git a/korlibs-crypto/.gitignore b/korlibs-crypto/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/korlibs-crypto/build.gradle.kts b/korlibs-crypto/build.gradle.kts
@@ -0,0 +1,26 @@
+
+import korlibs.*
+import korlibs.korge.gradle.generate.*
+
+description = "Korlibs Cryptography Library"
+
+project.extensions.extraProperties.properties.apply {
+    applyProjectProperties("https://github.com/korlibs/korge/korge-foundation",
+        "Apache 2.0",
+        "https://raw.githubusercontent.com/korlibs/korge/master/korge-foundation/LICENSE"
+    )
+}
+
+dependencies {
+    //add("commonMainImplementation", "org.jetbrains.kotlinx:atomicfu:${libs.versions.kotlinx.atomicfu.get()}")
+    //add("commonMainApi", "org.jetbrains.kotlinx:atomicfu:${libs.versions.kotlinx.atomicfu.get()}")
+    //add("jvmTestApi", "org.powermock:powermock-mockito-release-full:1.6.4")
+    //add("jvmTestApi", "org.fuin:units4j:0.8.4")
+    //add("jvmTestApi", "org.ow2.asm:asm:8.0.1")
+    commonMainApi(libs.kotlinx.coroutines.core)
+    commonMainApi(libs.kotlinx.atomicfu)
+    //add("commonMainApi", libs.kotlinx.atomicfu)
+    //add("commonTestApi", project(":korge-test"))
+    commonTestApi(libs.kotlinx.coroutines.test)
+    commonMainApi(project(":korlibs-time"))
+}
diff --git a/korge-foundation/src/korlibs/crypto/AES.kt → korlibs-crypto/src/korlibs/crypto/AES.kt b/korge-foundation/src/korlibs/crypto/AES.kt → korlibs-crypto/src/korlibs/crypto/AES.kt
diff --git a/...e-foundation/src/korlibs/crypto/Cipher.kt → korlibs-crypto/src/korlibs/crypto/Cipher.kt b/...e-foundation/src/korlibs/crypto/Cipher.kt → korlibs-crypto/src/korlibs/crypto/Cipher.kt
diff --git a/...undation/src/korlibs/crypto/CipherMode.kt → ...s-crypto/src/korlibs/crypto/CipherMode.kt b/...undation/src/korlibs/crypto/CipherMode.kt → ...s-crypto/src/korlibs/crypto/CipherMode.kt
@@ -1,7 +1,7 @@
 package korlibs.crypto
 
-import korlibs.memory.*
-import kotlin.experimental.*
+import korlibs.internal.arraycopy
+import kotlin.experimental.xor
 
 /**
  * Symmetric Cipher Mode

diff --git a/...ation/src/korlibs/crypto/CipherPadding.kt → ...rypto/src/korlibs/crypto/CipherPadding.kt b/...ation/src/korlibs/crypto/CipherPadding.kt → ...rypto/src/korlibs/crypto/CipherPadding.kt
@@ -1,6 +1,6 @@
 package korlibs.crypto
 
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 import kotlin.random.Random
 
 typealias Padding = CipherPadding

diff --git a/korge-foundation/src/korlibs/crypto/HMAC.kt → korlibs-crypto/src/korlibs/crypto/HMAC.kt b/korge-foundation/src/korlibs/crypto/HMAC.kt → korlibs-crypto/src/korlibs/crypto/HMAC.kt
@@ -1,6 +1,6 @@
 package korlibs.crypto
 
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 
 class HMAC {
 

diff --git a/...e-foundation/src/korlibs/crypto/Hasher.kt → korlibs-crypto/src/korlibs/crypto/Hasher.kt b/...e-foundation/src/korlibs/crypto/Hasher.kt → korlibs-crypto/src/korlibs/crypto/Hasher.kt
@@ -2,7 +2,7 @@ package korlibs.crypto
 
 import korlibs.encoding.Base64
 import korlibs.encoding.Hex
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 import kotlin.math.min
 
 open class HasherFactory(val name: String, val create: () -> Hasher) {

diff --git a/korge-foundation/src/korlibs/crypto/MD4.kt → korlibs-crypto/src/korlibs/crypto/MD4.kt b/korge-foundation/src/korlibs/crypto/MD4.kt → korlibs-crypto/src/korlibs/crypto/MD4.kt
diff --git a/korge-foundation/src/korlibs/crypto/MD5.kt → korlibs-crypto/src/korlibs/crypto/MD5.kt b/korge-foundation/src/korlibs/crypto/MD5.kt → korlibs-crypto/src/korlibs/crypto/MD5.kt
diff --git a/...e-foundation/src/korlibs/crypto/PBKDF2.kt → korlibs-crypto/src/korlibs/crypto/PBKDF2.kt b/...e-foundation/src/korlibs/crypto/PBKDF2.kt → korlibs-crypto/src/korlibs/crypto/PBKDF2.kt
@@ -1,6 +1,6 @@
 package korlibs.crypto
 
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 
 class PBKDF2 {
     companion object {

diff --git a/korge-foundation/src/korlibs/crypto/SHA.kt → korlibs-crypto/src/korlibs/crypto/SHA.kt b/korge-foundation/src/korlibs/crypto/SHA.kt → korlibs-crypto/src/korlibs/crypto/SHA.kt
diff --git a/korge-foundation/src/korlibs/crypto/SHA1.kt → korlibs-crypto/src/korlibs/crypto/SHA1.kt b/korge-foundation/src/korlibs/crypto/SHA1.kt → korlibs-crypto/src/korlibs/crypto/SHA1.kt
@@ -1,6 +1,6 @@
 package korlibs.crypto
 
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 import kotlin.rotateLeft
 
 class SHA1 : SHA(chunkSize = 64, digestSize = 20, name = "SHA1") {

diff --git a/...e-foundation/src/korlibs/crypto/SHA256.kt → korlibs-crypto/src/korlibs/crypto/SHA256.kt b/...e-foundation/src/korlibs/crypto/SHA256.kt → korlibs-crypto/src/korlibs/crypto/SHA256.kt
@@ -1,6 +1,6 @@
 package korlibs.crypto
 
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 import kotlin.rotateRight
 
 class SHA256 : SHA(chunkSize = 64, digestSize = 32) {

diff --git a/korge-foundation/src/korlibs/crypto/SHA3.kt → korlibs-crypto/src/korlibs/crypto/SHA3.kt b/korge-foundation/src/korlibs/crypto/SHA3.kt → korlibs-crypto/src/korlibs/crypto/SHA3.kt
diff --git a/...e-foundation/src/korlibs/crypto/SHA512.kt → korlibs-crypto/src/korlibs/crypto/SHA512.kt b/...e-foundation/src/korlibs/crypto/SHA512.kt → korlibs-crypto/src/korlibs/crypto/SHA512.kt
@@ -1,6 +1,6 @@
 package korlibs.crypto
 
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 
 // https://git.suckless.org/sbase/file/libutil/sha512.c.html
 // https://git.suckless.org/sbase/file/sha512.h.html

diff --git a/...dation/src/korlibs/crypto/SecureRandom.kt → ...crypto/src/korlibs/crypto/SecureRandom.kt b/...dation/src/korlibs/crypto/SecureRandom.kt → ...crypto/src/korlibs/crypto/SecureRandom.kt
@@ -1,6 +1,6 @@
 package korlibs.crypto
 
-import korlibs.memory.*
+import korlibs.internal.arraycopy
 import kotlin.random.Random
 
 expect fun fillRandomBytes(array: ByteArray)

diff --git a/...-foundation/src/korlibs/encoding/ASCII.kt → korlibs-crypto/src/korlibs/encoding/ASCII.kt b/...-foundation/src/korlibs/encoding/ASCII.kt → korlibs-crypto/src/korlibs/encoding/ASCII.kt
diff --git a/...foundation/src/korlibs/encoding/Base64.kt → ...ibs-crypto/src/korlibs/encoding/Base64.kt b/...foundation/src/korlibs/encoding/Base64.kt → ...ibs-crypto/src/korlibs/encoding/Base64.kt
@@ -1,7 +1,5 @@
 package korlibs.encoding
 
-import korlibs.encoding.*
-
 object Base64 {
     private val TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
     private val TABLE_URL = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_="

diff --git a/korge-foundation/src/korlibs/encoding/Hex.kt → korlibs-crypto/src/korlibs/encoding/Hex.kt b/korge-foundation/src/korlibs/encoding/Hex.kt → korlibs-crypto/src/korlibs/encoding/Hex.kt
diff --git a/korlibs-crypto/src/korlibs/internal/InternalCryptoArrays.kt b/korlibs-crypto/src/korlibs/internal/InternalCryptoArrays.kt
@@ -0,0 +1,11 @@
+package korlibs.internal
+
+/** Copies [size] elements of [src] starting at [srcPos] into [dst] at [dstPos]  */
+internal fun arraycopy(src: ByteArray, srcPos: Int, dst: ByteArray, dstPos: Int, size: Int) {
+    src.copyInto(dst, dstPos, srcPos, srcPos + size)
+}
+
+/** Copies [size] elements of [src] starting at [srcPos] into [dst] at [dstPos]  */
+internal fun arraycopy(src: IntArray, srcPos: Int, dst: IntArray, dstPos: Int, size: Int) {
+    src.copyInto(dst, dstPos, srcPos, srcPos + size)
+}
diff --git a/...n/src@android/korlibs/crypto/PRNGFixes.kt → ...o/src@android/korlibs/crypto/PRNGFixes.kt b/...n/src@android/korlibs/crypto/PRNGFixes.kt → ...o/src@android/korlibs/crypto/PRNGFixes.kt
diff --git a/...android/korlibs/crypto/SecureRandomJvm.kt → ...android/korlibs/crypto/SecureRandomJvm.kt b/...android/korlibs/crypto/SecureRandomJvm.kt → ...android/korlibs/crypto/SecureRandomJvm.kt
diff --git a/...korlibs/crypto/SecureRandomNativePosix.kt → ...korlibs/crypto/SecureRandomNativePosix.kt b/...korlibs/crypto/SecureRandomNativePosix.kt → ...korlibs/crypto/SecureRandomNativePosix.kt
diff --git a/...n/src@js/korlibs/crypto/SecureRandomJs.kt → ...o/src@js/korlibs/crypto/SecureRandomJs.kt b/...n/src@js/korlibs/crypto/SecureRandomJs.kt → ...o/src@js/korlibs/crypto/SecureRandomJs.kt
diff --git a/...src@jvm/korlibs/crypto/SecureRandomJvm.kt → ...src@jvm/korlibs/crypto/SecureRandomJvm.kt b/...src@jvm/korlibs/crypto/SecureRandomJvm.kt → ...src@jvm/korlibs/crypto/SecureRandomJvm.kt
diff --git a/.../korlibs/crypto/SecureRandomNativeWasm.kt → .../korlibs/crypto/SecureRandomNativeWasm.kt b/.../korlibs/crypto/SecureRandomNativeWasm.kt → .../korlibs/crypto/SecureRandomNativeWasm.kt
diff --git a/...foundation/test/korlibs/crypto/AESTest.kt → ...ibs-crypto/test/korlibs/crypto/AESTest.kt b/...foundation/test/korlibs/crypto/AESTest.kt → ...ibs-crypto/test/korlibs/crypto/AESTest.kt
diff --git a/...ndation/test/korlibs/crypto/Base64Test.kt → ...-crypto/test/korlibs/crypto/Base64Test.kt b/...ndation/test/korlibs/crypto/Base64Test.kt → ...-crypto/test/korlibs/crypto/Base64Test.kt
diff --git a/...tion/test/korlibs/crypto/Base64UrlTest.kt → ...ypto/test/korlibs/crypto/Base64UrlTest.kt b/...tion/test/korlibs/crypto/Base64UrlTest.kt → ...ypto/test/korlibs/crypto/Base64UrlTest.kt
diff --git a/...ndation/test/korlibs/crypto/CipherTest.kt → ...-crypto/test/korlibs/crypto/CipherTest.kt b/...ndation/test/korlibs/crypto/CipherTest.kt → ...-crypto/test/korlibs/crypto/CipherTest.kt
diff --git a/...oundation/test/korlibs/crypto/HMACTest.kt → ...bs-crypto/test/korlibs/crypto/HMACTest.kt b/...oundation/test/korlibs/crypto/HMACTest.kt → ...bs-crypto/test/korlibs/crypto/HMACTest.kt
diff --git a/...foundation/test/korlibs/crypto/MD4Test.kt → ...ibs-crypto/test/korlibs/crypto/MD4Test.kt b/...foundation/test/korlibs/crypto/MD4Test.kt → ...ibs-crypto/test/korlibs/crypto/MD4Test.kt
diff --git a/...foundation/test/korlibs/crypto/MD5Test.kt → ...ibs-crypto/test/korlibs/crypto/MD5Test.kt b/...foundation/test/korlibs/crypto/MD5Test.kt → ...ibs-crypto/test/korlibs/crypto/MD5Test.kt
diff --git a/...ndation/test/korlibs/crypto/PBKDF2Test.kt → ...-crypto/test/korlibs/crypto/PBKDF2Test.kt b/...ndation/test/korlibs/crypto/PBKDF2Test.kt → ...-crypto/test/korlibs/crypto/PBKDF2Test.kt
diff --git a/...oundation/test/korlibs/crypto/SHA1Test.kt → ...bs-crypto/test/korlibs/crypto/SHA1Test.kt b/...oundation/test/korlibs/crypto/SHA1Test.kt → ...bs-crypto/test/korlibs/crypto/SHA1Test.kt
diff --git a/...ndation/test/korlibs/crypto/SHA256Test.kt → ...-crypto/test/korlibs/crypto/SHA256Test.kt b/...ndation/test/korlibs/crypto/SHA256Test.kt → ...-crypto/test/korlibs/crypto/SHA256Test.kt
diff --git a/...ndation/test/korlibs/crypto/SHA512Test.kt → ...-crypto/test/korlibs/crypto/SHA512Test.kt b/...ndation/test/korlibs/crypto/SHA512Test.kt → ...-crypto/test/korlibs/crypto/SHA512Test.kt
diff --git a/...n/test/korlibs/crypto/SecureRandomTest.kt → ...o/test/korlibs/crypto/SecureRandomTest.kt b/...n/test/korlibs/crypto/SecureRandomTest.kt → ...o/test/korlibs/crypto/SecureRandomTest.kt
diff --git a/...ion/test@jvm/korlibs/crypto/AESJvmTest.kt → ...pto/test@jvm/korlibs/crypto/AESJvmTest.kt b/...ion/test@jvm/korlibs/crypto/AESJvmTest.kt → ...pto/test@jvm/korlibs/crypto/AESJvmTest.kt
diff --git a/.../test@jvm/korlibs/crypto/PBKDF2JvmTest.kt → .../test@jvm/korlibs/crypto/PBKDF2JvmTest.kt b/.../test@jvm/korlibs/crypto/PBKDF2JvmTest.kt → .../test@jvm/korlibs/crypto/PBKDF2JvmTest.kt
diff --git a/.../test@jvm/korlibs/crypto/SHA512JvmTest.kt → .../test@jvm/korlibs/crypto/SHA512JvmTest.kt b/.../test@jvm/korlibs/crypto/SHA512JvmTest.kt → .../test@jvm/korlibs/crypto/SHA512JvmTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -26,6 +26,7 @@ val inCI = isPropertyTrue("CI")
 val disabledExtraKorgeLibs = isPropertyTrue("DISABLED_EXTRA_KORGE_LIBS")
 
 include(":korlibs-time")
+include(":korlibs-crypto")
 include(":korlibs-template")
 include(":korge-foundation")
 include(":korge-core")