Move symmetric algorithms into the algorithms package

whyoleg · Sep 7, 2024 · 7be4997 · 7be4997
1 parent 28d190c
commit 7be4997
Show file tree

Hide file tree

Showing 44 changed files with 269 additions and 262 deletions.
diff --git a/cryptography-core/api/cryptography-core.api b/cryptography-core/api/cryptography-core.api
diff --git a/cryptography-core/api/cryptography-core.klib.api b/cryptography-core/api/cryptography-core.klib.api
diff --git a/...onMain/kotlin/algorithms/symmetric/AES.kt → ...e/src/commonMain/kotlin/algorithms/AES.kt b/...onMain/kotlin/algorithms/symmetric/AES.kt → ...e/src/commonMain/kotlin/algorithms/AES.kt
@@ -2,10 +2,11 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.algorithms.symmetric
+package dev.whyoleg.cryptography.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
+import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import kotlinx.io.bytestring.*

diff --git a/...nMain/kotlin/algorithms/symmetric/HMAC.kt → .../src/commonMain/kotlin/algorithms/HMAC.kt b/...nMain/kotlin/algorithms/symmetric/HMAC.kt → .../src/commonMain/kotlin/algorithms/HMAC.kt
@@ -2,10 +2,9 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.algorithms.symmetric
+package dev.whyoleg.cryptography.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 

diff --git a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/SymmetricKeySize.kt b/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/SymmetricKeySize.kt
@@ -24,7 +24,7 @@ public value class SymmetricKeySize
 constructor(public val value: BinarySize) {
     @Deprecated(
         "Replaced by AES.Key.Size as it's not really needed outside of AES",
-        ReplaceWith("AES.Key.Size", "dev.whyoleg.cryptography.algorithms.symmetric.AES"),
+        ReplaceWith("AES.Key.Size", "dev.whyoleg.cryptography.algorithms.AES"),
         DeprecationLevel.ERROR
     )
     public companion object {

diff --git a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/deprecated.kt b/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/deprecated.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.whyoleg.cryptography.algorithms.symmetric
+
+@Deprecated(
+    "Moved to another package",
+    ReplaceWith("AES", "dev.whyoleg.cryptography.algorithms.AES"),
+    DeprecationLevel.ERROR
+)
+public typealias AES<K> = dev.whyoleg.cryptography.algorithms.AES<K>
+
+@Deprecated(
+    "Moved to another package",
+    ReplaceWith("HMAC", "dev.whyoleg.cryptography.algorithms.HMAC"),
+    DeprecationLevel.ERROR
+)
+public typealias HMAC = dev.whyoleg.cryptography.algorithms.HMAC
diff --git a/cryptography-providers-tests-api/src/commonMain/kotlin/generators.kt b/cryptography-providers-tests-api/src/commonMain/kotlin/generators.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.tests.api
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 
 inline fun generateSymmetricKeySize(block: (keySize: BinarySize) -> Unit) {

diff --git a/cryptography-providers-tests-api/src/commonMain/kotlin/support.kt b/cryptography-providers-tests-api/src/commonMain/kotlin/support.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.tests.api
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.serialization.asn1.*
 import dev.whyoleg.cryptography.serialization.asn1.modules.*

diff --git a/cryptography-providers-tests/src/commonMain/kotlin/SupportedAlgorithmsTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/SupportedAlgorithmsTest.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.tests
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import kotlin.test.*
 

diff --git a/...y-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedCompatibilityTest.kt b/...y-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import kotlinx.serialization.*

diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 
 abstract class AesBasedTest<A : AES<*>>(

diff --git a/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcCompatibilityTest.kt b/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*

diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.random.*
 import kotlin.test.*

diff --git a/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCtrCompatibilityTest.kt b/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCtrCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*

diff --git a/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesEcbCompatibilityTest.kt b/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesEcbCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*

diff --git a/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmCompatibilityTest.kt b/...phy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmCompatibilityTest.kt
@@ -6,7 +6,7 @@ package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*

diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmTest.kt
@@ -6,7 +6,7 @@ package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.random.*
 import kotlin.test.*
 

diff --git a/...raphy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacCompatibilityTest.kt b/...raphy-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*

diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacTest.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.random.*
 import kotlin.math.*

diff --git a/cryptography-providers/apple/src/commonMain/kotlin/AppleCryptographyProvider.kt b/cryptography-providers/apple/src/commonMain/kotlin/AppleCryptographyProvider.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.apple
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.apple.algorithms.*
 
 private val defaultProvider = lazy { AppleCryptographyProvider }
@@ -25,11 +24,11 @@ internal object AppleCryptographyProvider : CryptographyProvider() {
         SHA256    -> CCDigest(CCHashAlgorithm.SHA256, SHA256)
         SHA384    -> CCDigest(CCHashAlgorithm.SHA384, SHA384)
         SHA512    -> CCDigest(CCHashAlgorithm.SHA512, SHA512)
-        HMAC      -> CCHmac
-        AES.CBC   -> CCAesCbc
+        HMAC    -> CCHmac
+        AES.CBC -> CCAesCbc
         AES.CTR -> CCAesCtr
         AES.ECB -> CCAesEcb
-        RSA.PSS   -> SecRsaPss
+        RSA.PSS -> SecRsaPss
         RSA.PKCS1 -> SecRsaPkcs1
         RSA.OAEP  -> SecRsaOaep
         RSA.RAW -> SecRsaRaw

diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAes.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAes.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.random.*
 

diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCbc.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCbc.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.apple.internal.*
 import dev.whyoleg.cryptography.random.*
 import platform.CoreCrypto.*

diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCtr.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCtr.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.apple.internal.*
 import dev.whyoleg.cryptography.random.*
 import kotlinx.cinterop.*

diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesEcb.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesEcb.kt
@@ -4,7 +4,7 @@
 
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.apple.internal.*
 import platform.CoreCrypto.*

diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCHmac.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCHmac.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*

diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/JdkCryptographyProvider.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/JdkCryptographyProvider.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.jdk
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.jdk.algorithms.*
 import dev.whyoleg.cryptography.random.*
 import java.security.*
@@ -79,12 +78,12 @@ internal class JdkCryptographyProvider(
             SHA3_256  -> JdkDigest(state, "SHA3-256", SHA3_256)
             SHA3_384  -> JdkDigest(state, "SHA3-384", SHA3_384)
             SHA3_512  -> JdkDigest(state, "SHA3-512", SHA3_512)
-            HMAC      -> JdkHmac(state)
-            AES.CBC   -> JdkAesCbc(state)
-            AES.CTR -> JdkAesCtr(state)
-            AES.ECB -> JdkAesEcb(state)
-            AES.GCM   -> JdkAesGcm(state)
-            RSA.OAEP  -> JdkRsaOaep(state)
+            HMAC     -> JdkHmac(state)
+            AES.CBC  -> JdkAesCbc(state)
+            AES.CTR  -> JdkAesCtr(state)
+            AES.ECB  -> JdkAesEcb(state)
+            AES.GCM  -> JdkAesGcm(state)
+            RSA.OAEP -> JdkRsaOaep(state)
             RSA.PSS   -> JdkRsaPss(state)
             RSA.PKCS1 -> JdkRsaPkcs1(state)
             RSA.RAW -> JdkRsaRaw(state)

diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCbc.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCbc.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.signature.*
 import dev.whyoleg.cryptography.providers.jdk.*

diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCtr.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCtr.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.providers.jdk.*
 import dev.whyoleg.cryptography.providers.jdk.materials.*

diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesEcb.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesEcb.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.jdk.*

diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesGcm.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesGcm.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.jdk.*

diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkHmac.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkHmac.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.jdk.*

diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/Openssl3CryptographyProvider.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/Openssl3CryptographyProvider.kt
@@ -8,7 +8,6 @@ import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.RSA
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.openssl3.algorithms.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
 import kotlinx.cinterop.*
@@ -32,12 +31,12 @@ internal object Openssl3CryptographyProvider : CryptographyProvider() {
         SHA3_256  -> Openssl3Digest("SHA3-256", SHA3_256)
         SHA3_384  -> Openssl3Digest("SHA3-384", SHA3_384)
         SHA3_512  -> Openssl3Digest("SHA3-512", SHA3_512)
-        HMAC      -> Openssl3Hmac
-        AES.CBC   -> Openssl3AesCbc
+        HMAC    -> Openssl3Hmac
+        AES.CBC -> Openssl3AesCbc
         AES.CTR -> Openssl3AesCtr
         AES.ECB -> Openssl3AesEcb
-        AES.GCM   -> Openssl3AesGcm
-        ECDSA     -> Openssl3Ecdsa
+        AES.GCM -> Openssl3AesGcm
+        ECDSA   -> Openssl3Ecdsa
         ECDH    -> Openssl3Ecdh
         RSA.PSS   -> Openssl3RsaPss
         RSA.PKCS1 -> Openssl3RsaPkcs1

diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Aes.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Aes.kt
@@ -6,7 +6,7 @@ package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bytes
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.random.*
 

diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCbc.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCbc.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
 import dev.whyoleg.cryptography.random.*
@@ -21,7 +21,7 @@ internal object Openssl3AesCbc : AES.CBC, Openssl3Aes<AES.CBC.Key>() {
             AES.Key.Size.B128 -> "AES-128-CBC"
             AES.Key.Size.B192 -> "AES-192-CBC"
             AES.Key.Size.B256 -> "AES-256-CBC"
-            else                  -> error("Unsupported key size")
+            else -> error("Unsupported key size")
         }
 
         override fun cipher(padding: Boolean): AES.IvCipher = AesCbcCipher(algorithm, key, padding)

diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCtr.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCtr.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
 import dev.whyoleg.cryptography.random.*

diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesEcb.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesEcb.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*

diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesGcm.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesGcm.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*

diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Hmac.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Hmac.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*