keys refactoring: removed separate UniversalKey, it is now a direct base of any real keys instead of deleted KeyInstance

This commit is contained in:
sergeych committed 2024-06-24 15:44:35 +07:00
1 parent 5c97e857fc
commit 46a8b5bc06
12 files changed
+103 -184

No files matched your search

+19 -8
View File
@@ -4,6 +4,8 @@ import kotlinx.coroutines.test.runTest
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import net.sergeych.crypto2.*
import net.sergeych.tools.bipack
import net.sergeych.tools.biunpack
import net.sergeych.utools.now
import net.sergeych.utools.pack
import net.sergeych.utools.unpack
@@ -187,9 +189,9 @@ class KeysTest {
assertEquals(sy1, deepCopy(sy1), "symmetric key should be equal to the restored copy")
assertEquals(sy1.hashCode(), deepCopy(sy1).hashCode(), "hashcode of the restored symmetric key is wrong")
val usy1 = UniversalKey.from(sy1)
val usy2 = UniversalKey.from(sy2)
val usy3 = UniversalKey.from(sy3)
val usy1 = sy1 as UniversalKey
val usy2 = sy2 as UniversalKey
val usy3 = sy3 as UniversalKey
assertEquals(usy1, usy2)
assertEquals(usy2, usy1)
@@ -203,10 +205,10 @@ class KeysTest {
assertEquals(sk2, sk1)
assertFalse { sk1 == sk3 }
var usk1 = UniversalKey.from(sk1)
var usk2 = UniversalKey.from(sk2)
var usk3 = UniversalKey.from(sk3)
val usk4 = UniversalKey.from(sy3)
var usk1 = sk1 as UniversalKey
var usk2 = sk2 as UniversalKey
var usk3 = sk3 as UniversalKey
val usk4 = sy3 as UniversalKey
assertEquals(usk1, usk2)
assertEquals(usk2, usk1)
@@ -223,7 +225,7 @@ class KeysTest {
usk2 = deepCopy(usk2)
usk3 = deepCopy(usk3)
assertEquals(usk1.hashCode(),usk2.hashCode())
assertEquals(usk1.hashCode(), usk2.hashCode())
assertEquals(usk1, usk2)
assertEquals(usk2, usk1)
@@ -239,4 +241,13 @@ class KeysTest {
// usk1 and usk2 are equal so set with only one of should be the same
assertEquals(a, setOf(usk1, usk3, usk4))
}
@Test
fun testKiSerialization() = runTest {
initCrypto()
val k: UniversalKey = SymmetricKey.new()
val d = bipack(k)
val k1: UniversalKey = biunpack<UniversalKey>(d) as SymmetricKey
assertEquals(k, k1)
}
}