Initial AES-CTR API refactoring

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

@@ -17,6 +17,7 @@
 package com.ionspin.kotlin.crypto.symmetric
 
 import com.ionspin.kotlin.crypto.SRNG
+import com.ionspin.kotlin.crypto.symmetric.aes.AesKey
 import com.ionspin.kotlin.crypto.util.xor
 
 /**

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

@@ -21,6 +21,8 @@ import com.ionspin.kotlin.bignum.integer.BigInteger
 import com.ionspin.kotlin.bignum.modular.ModularBigInteger
 import com.ionspin.kotlin.crypto.SRNG
 import com.ionspin.kotlin.crypto.symmetric.AesCtrPure.Companion.encrypt
+import com.ionspin.kotlin.crypto.symmetric.aes.AesKey
+import com.ionspin.kotlin.crypto.symmetric.aes.EncryptedDataAndInitialCounter
 import com.ionspin.kotlin.crypto.util.xor
 
 /**
@@ -187,22 +189,3 @@ class AesCtrPure internal constructor(val aesKey: AesKey, val mode: Mode, initia
 }
 
 
-data class EncryptedDataAndInitialCounter(val encryptedData : UByteArray, val initialCounter : UByteArray) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || this::class != other::class) return false
-
-        other as EncryptedDataAndInitializationVector
-
-        if (!encryptedData.contentEquals(other.encryptedData)) return false
-        if (!initialCounter.contentEquals(other.initilizationVector)) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = encryptedData.contentHashCode()
-        result = 31 * result + initialCounter.contentHashCode()
-        return result
-    }
-}

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

@@ -356,23 +356,6 @@ internal class AesPure internal constructor(val aesKey: AesKey, val input: UByte
 
 }
 
-sealed class AesKey(val key: String, val keyLength: Int) {
-    val keyArray: UByteArray = key.chunked(2).map { it.toUByte(16) }.toUByteArray()
-    val numberOf32BitWords = keyLength / 32
-
-    class Aes128Key(key: String) : AesKey(key, 128)
-    class Aes192Key(key: String) : AesKey(key, 192)
-    class Aes256Key(key: String) : AesKey(key, 256)
-
-    init {
-        checkKeyLength(key, keyLength)
-    }
-
-    fun checkKeyLength(key: String, expectedLength: Int) {
-        if ((key.length / 2) != expectedLength / 8) {
-            throw RuntimeException("Invalid key length")
-        }
-    }
-}
+
 
 

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

@@ -1,27 +0,0 @@
-/*
- *    Copyright 2019 Ugljesa Jovanovic
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.ionspin.kotlin.crypto.symmetric
-
-/**
- * Created by Ugljesa Jovanovic
- * ugljesa.jovanovic@ionspin.com
- * on 18-Sep-2019
- */
-
-enum class Mode {
-    ENCRYPT, DECRYPT
-}