Dropping AES gcm from public api as it's not portable in libsodium and going the xchacha20poly1305 as only AEAD

multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/authenticated/Aes256GcmPure.kt

@@ -1,18 +1,24 @@
 package com.ionspin.kotlin.crypto.authenticated
 
+import com.ionspin.kotlin.crypto.SRNG
+
 /**
  * Created by Ugljesa Jovanovic
  * ugljesa.jovanovic@ionspin.com
  * on 14-Jun-2020
  */
-class Aes256GcmStatelessPure : Aes256GcmStateless {
+internal class Aes256GcmStatelessPure : Aes256GcmStateless {
     /**
      * Nonce autogenerated
      */
-    override fun encrypt(message: UByteArray, additionalData: UByteArray, rawData : UByteArray, key:) : Aes256GcmEncryptionResult {
+    override fun encrypt(message: UByteArray, additionalData: UByteArray, rawData : UByteArray, key: Aes256GcmKey) : Aes256GcmEncryptionResult {
 
         TODO()
 
     }
 
-}
+    override fun decrypt(encryptedData: UByteArray, nonce: UByteArray, key: Aes256GcmKey): UByteArray {
+        TODO("not implemented yet")
+    }
+
+}

multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/authenticated/XChaChaPoly1305.kt

@@ -0,0 +1,7 @@
+package com.ionspin.kotlin.crypto.authenticated
+
+/**
+ * Created by Ugljesa Jovanovic
+ * ugljesa.jovanovic@ionspin.com
+ * on 14-Jun-2020
+ */

multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/symmetric/Salsa20.kt

@@ -0,0 +1,31 @@
+package com.ionspin.kotlin.crypto.symmetric
+
+import com.ionspin.kotlin.crypto.util.*
+
+/**
+ * Created by Ugljesa Jovanovic
+ * ugljesa.jovanovic@ionspin.com
+ * on 14-Jun-2020
+ */
+class Salsa20 {
+    companion object {
+        fun coreHash(input: UByteArray) : UByteArray {
+            val y0 = input.fromBigEndianArrayToUintWithPosition(0)
+            val y1 = input.fromBigEndianArrayToUintWithPosition(4)
+            val y2 = input.fromBigEndianArrayToUintWithPosition(8)
+            val y3 = input.fromBigEndianArrayToUintWithPosition(12);
+
+            val z1 = y1 xor ((y0 + y3) rotateLeft  7)
+            val z2 = y2 xor ((z1 + y0) rotateLeft  9)
+            val z3 = y3 xor ((z2 + z1) rotateLeft 13)
+            val z0 = y0 xor ((z3 + z2) rotateLeft 18)
+            val result = UByteArray(16)
+            result.insertUIntAtPositionAsBigEndian(0, z0)
+            result.insertUIntAtPositionAsBigEndian(4, z1)
+            result.insertUIntAtPositionAsBigEndian(8, z2)
+            result.insertUIntAtPositionAsBigEndian(12, z3)
+            return result
+        }
+    }
+
+}

multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/symmetric/XChaCha20Pure.kt

@@ -0,0 +1,20 @@
+package com.ionspin.kotlin.crypto.symmetric
+
+/**
+ * Created by Ugljesa Jovanovic
+ * ugljesa.jovanovic@ionspin.com
+ * on 14-Jun-2020
+ */
+class XChaCha20Pure {
+
+
+    companion object {
+
+        val chachaState = UByteArray(64)
+
+        fun quarterRound() {
+
+        }
+    }
+
+}

multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/util/Util.kt

@@ -18,6 +18,8 @@
 
 package com.ionspin.kotlin.crypto.util
 
+import com.ionspin.kotlin.crypto.keyderivation.argon2.ArgonBlockPointer
+
 /**
  * Created by Ugljesa Jovanovic
  * ugljesa.jovanovic@ionspin.com
@@ -72,6 +74,14 @@ infix fun ULong.rotateRight(places: Int): ULong {
     return (this shr places) xor (this shl (64 - places))
 }
 
+infix fun UInt.rotateLeft(places: Int): UInt {
+    return (this shl places) xor (this shr (32 - places))
+}
+
+
+infix fun ULong.rotateLeft(places: Int): ULong {
+    return (this shl places) xor (this shr (64 - places))
+}
 
 infix fun Array<UByte>.xor(other : Array<UByte>) : Array<UByte> {
     if (this.size != other.size) {
@@ -231,9 +241,33 @@ fun UByteArray.fromLittleEndianArrayToUInt() : UInt {
     return uint
 }
 
+fun UByteArray.fromLittleEndianArrayToUintWithPosition(position: Int) : UInt{
+    var uint = 0U
+    for (i in 0 until 4) {
+        uint = uint or (this[position + i].toUInt() shl (i * 8))
+    }
+    return uint
+}
 
+fun UByteArray.fromBigEndianArrayToUintWithPosition(position: Int) : UInt{
+    var uint = 0U
+    for (i in 0 until 4) {
+        uint = uint shl 8 or (this[position + i].toUInt())
+    }
+    return uint
+}
 
+fun UByteArray.insertUIntAtPositionAsLittleEndian(position: Int, value: UInt) {
+    for (i in position until position + 4) {
+        this[i] = ((value shr (i * 8)) and 0xFFU).toUByte()
+    }
+}
 
+fun UByteArray.insertUIntAtPositionAsBigEndian(position: Int, value: UInt) {
+    for (i in position until position + 4) {
+        this[i] = ((value shr (24 - i * 8)) and 0xFFU).toUByte()
+    }
+}
 
 fun Array<UByte>.fromBigEndianArrayToUInt() : UInt {
     if (this.size > 4) {

multiplatform-crypto/src/commonTest/kotlin/com/ionspin/kotlin/crypto/symmetric/AesCbcTest.kt

@@ -43,7 +43,7 @@ class AesCbcTest {
             println("Encrypted: ${encrypted.encryptedData.toHexString()}")
 
             expectedCipherText == encrypted.encryptedData.toHexString() &&
-                    iv == encrypted.initilizationVector.toHexString()
+                    iv == encrypted.initializationVector.toHexString()
         }
 
 
@@ -62,7 +62,7 @@ class AesCbcTest {
             val decrypted = AesCbcPure.decrypt(
                 key,
                 encryptedDataAndInitializationVector.encryptedData,
-                encryptedDataAndInitializationVector.initilizationVector
+                encryptedDataAndInitializationVector.initializationVector
             )
             plainText == decrypted.toHexString()
         }

multiplatform-crypto/src/commonTest/kotlin/com/ionspin/kotlin/crypto/symmetric/Salsa20Test.kt

@@ -0,0 +1,82 @@
+package com.ionspin.kotlin.crypto.symmetric
+
+import com.ionspin.kotlin.crypto.util.hexStringToUByteArray
+import com.ionspin.kotlin.crypto.util.rotateLeft
+import com.ionspin.kotlin.crypto.util.toHexString
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+/**
+ * Created by Ugljesa Jovanovic
+ * ugljesa.jovanovic@ionspin.com
+ * on 14-Jun-2020
+ */
+class Salsa20Test {
+
+    @Test
+    fun testRotateLeft() {
+        val a = 0xc0a8787eU
+        val b = a rotateLeft 5
+        val expected  = 0x150f0fd8U
+        assertEquals(b, expected)
+    }
+
+    @Test
+    fun testCoreHash() {
+        assertTrue {
+            val input =    "00000000000000000000000000000000".hexStringToUByteArray()
+            val expected = "00000000000000000000000000000000".hexStringToUByteArray()
+            val result = Salsa20.coreHash(input)
+            println("Result ${result.toHexString()}")
+
+            expected.contentEquals(result)
+        }
+
+        assertTrue {
+            val input =    "00000001000000000000000000000000".hexStringToUByteArray()
+            val expected = "08008145000000800001020020500000".hexStringToUByteArray()
+            val result = Salsa20.coreHash(input)
+            println("Result ${result.toHexString()}")
+
+            expected.contentEquals(result)
+        }
+
+        assertTrue {
+            val input =    "00000000000000010000000000000000".hexStringToUByteArray()
+            val expected = "88000100000000010000020000402000".hexStringToUByteArray()
+            val result = Salsa20.coreHash(input)
+            println("Result ${result.toHexString()}")
+
+            expected.contentEquals(result)
+        }
+
+        assertTrue {
+            val input =    "00000000000000000000000100000000".hexStringToUByteArray()
+            val expected = "80040000000000000000000100002000".hexStringToUByteArray()
+            val result = Salsa20.coreHash(input)
+            println("Result ${result.toHexString()}")
+
+            expected.contentEquals(result)
+        }
+
+        assertTrue {
+            val input =    "00000000000000000000000000000001".hexStringToUByteArray()
+            val expected = "00048044000000800001000020100001".hexStringToUByteArray()
+            val result = Salsa20.coreHash(input)
+            println("Result ${result.toHexString()}")
+
+            expected.contentEquals(result)
+        }
+
+
+        assertTrue {
+            val input =    "d3917c5b55f1c40752a58a7a8f887a3b".hexStringToUByteArray()
+            val expected = "3e2f308cd90a8f366ab2a9232883524c".hexStringToUByteArray()
+            val result = Salsa20.coreHash(input)
+            println("Result ${result.toHexString()}")
+
+            expected.contentEquals(result)
+        }
+    }
+}