Update signum

a-sit-plus · Dec 4, 2024 · e34d005 · e34d005
1 parent a0306c1
commit e34d005
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/signum b/signum
diff --git a/vck/src/commonTest/kotlin/at/asitplus/wallet/lib/cbor/DeviceSignedItemSerializationTest.kt b/vck/src/commonTest/kotlin/at/asitplus/wallet/lib/cbor/DeviceSignedItemSerializationTest.kt
@@ -1,8 +1,8 @@
 package at.asitplus.wallet.lib.cbor
 
+import at.asitplus.signum.indispensable.CryptoSignature
 import at.asitplus.signum.indispensable.cosef.CoseHeader
 import at.asitplus.signum.indispensable.cosef.CoseSigned
-import at.asitplus.signum.indispensable.cosef.io.ByteStringWrapper
 import at.asitplus.wallet.lib.iso.*
 import com.benasher44.uuid.uuid4
 import io.kotest.core.spec.style.FreeSpec
@@ -47,9 +47,9 @@ class DeviceSignedItemSerializationTest : FreeSpec({
             key = elementId,
             value = Random.nextBytes(32),
         )
-        val protectedHeader = ByteStringWrapper(CoseHeader(), CoseHeader().serialize())
-        val issuerAuth = CoseSigned<MobileSecurityObject>(protectedHeader, null, null, byteArrayOf())
-        val deviceAuth = CoseSigned<ByteArray>(protectedHeader, null, null, byteArrayOf())
+        val protectedHeader = CoseHeader()
+        val issuerAuth = CoseSigned<MobileSecurityObject>(protectedHeader, null, null, CryptoSignature.RSAorHMAC(byteArrayOf()))
+        val deviceAuth = CoseSigned<ByteArray>(protectedHeader, null, null, CryptoSignature.RSAorHMAC(byteArrayOf()))
 
         val doc = Document(
             docType = uuid4().toString(),

diff --git a/vck/src/commonTest/kotlin/at/asitplus/wallet/lib/cbor/IssuerSignedItemSerializationTest.kt b/vck/src/commonTest/kotlin/at/asitplus/wallet/lib/cbor/IssuerSignedItemSerializationTest.kt
@@ -1,5 +1,6 @@
 package at.asitplus.wallet.lib.cbor
 
+import at.asitplus.signum.indispensable.CryptoSignature
 import at.asitplus.signum.indispensable.cosef.CoseHeader
 import at.asitplus.signum.indispensable.cosef.CoseSigned
 import at.asitplus.signum.indispensable.cosef.io.ByteStringWrapper
@@ -45,8 +46,8 @@ class IssuerSignedItemSerializationTest : FreeSpec({
             elementIdentifier = elementId,
             elementValue = Random.nextBytes(32),
         )
-        val protectedHeader = ByteStringWrapper(CoseHeader(), CoseHeader().serialize())
-        val issuerAuth = CoseSigned<MobileSecurityObject>(protectedHeader, null, null, byteArrayOf())
+        val protectedHeader = CoseHeader()
+        val issuerAuth = CoseSigned<MobileSecurityObject>(protectedHeader, null, null, CryptoSignature.RSAorHMAC(byteArrayOf()))
         val doc = Document(
             docType = uuid4().toString(),
             issuerSigned = IssuerSigned.fromIssuerSignedItems(

diff --git a/vck/src/commonTest/kotlin/at/asitplus/wallet/lib/iso/Tag24SerializationTest.kt b/vck/src/commonTest/kotlin/at/asitplus/wallet/lib/iso/Tag24SerializationTest.kt
@@ -1,8 +1,8 @@
 package at.asitplus.wallet.lib.iso
 
 import at.asitplus.catching
+import at.asitplus.signum.indispensable.CryptoSignature
 import at.asitplus.signum.indispensable.cosef.*
-import at.asitplus.signum.indispensable.cosef.io.Base16Strict
 import at.asitplus.signum.indispensable.cosef.io.ByteStringWrapper
 import at.asitplus.signum.indispensable.cosef.io.ByteStringWrapperSerializer
 import at.asitplus.wallet.lib.agent.DummyCredentialDataProvider
@@ -49,10 +49,10 @@ class Tag24SerializationTest : FreeSpec({
             ),
             deviceAuth = DeviceAuth(
                 deviceSignature = CoseSigned<ByteArray>(
-                    protectedHeader = ByteStringWrapper(CoseHeader()),
+                    protectedHeader = CoseHeader(),
                     unprotectedHeader = null,
                     payload = byteArrayOf(),
-                    rawSignature = byteArrayOf()
+                    signature = CryptoSignature.RSAorHMAC(byteArrayOf())
                 )
 
             )
@@ -121,10 +121,10 @@ class Tag24SerializationTest : FreeSpec({
         )
         val serializedMso = mso.serializeForIssuerAuth()
         val input = CoseSigned<MobileSecurityObject>(
-            protectedHeader = ByteStringWrapper(CoseHeader()),
+            protectedHeader = CoseHeader(),
             unprotectedHeader = null,
             payload = mso,
-            rawSignature = byteArrayOf()
+            signature = CryptoSignature.RSAorHMAC(byteArrayOf())
         )
 
         val serialized = vckCborSerializer.encodeToByteArray(input)
@@ -171,10 +171,10 @@ private fun deviceKeyInfo() =
     DeviceKeyInfo(CoseKey(CoseKeyType.EC2, keyParams = CoseKeyParams.EcYBoolParams(CoseEllipticCurve.P256)))
 
 private fun issuerAuth() = CoseSigned<MobileSecurityObject>(
-    protectedHeader = ByteStringWrapper(CoseHeader()),
+    protectedHeader = CoseHeader(),
     unprotectedHeader = null,
     payload = null,
-    rawSignature = byteArrayOf()
+    signature = CryptoSignature.RSAorHMAC(byteArrayOf())
 )
 
 private fun issuerSignedItem() = IssuerSignedItem(0u, Random.nextBytes(16), "identifier", "value")
+2 −2		CHANGELOG.md
+14 −4		indispensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseSigned.kt
+1 −1		indispensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseSignedSerializer.kt
+10 −10		indispensable-cosef/src/commonTest/kotlin/at/asitplus/signum/indispensable/cosef/CoseEqualsTest.kt
+15 −1		indispensable-cosef/src/commonTest/kotlin/at/asitplus/signum/indispensable/cosef/CoseSerializationTest.kt