WIP: Missing correct tags for ByteStringWrapper in CoseSigned

a-sit-plus · Nov 27, 2024 · 0d6ca76 · 0d6ca76
1 parent 9e4bad4
commit 0d6ca76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/signum b/signum
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
@@ -2,13 +2,15 @@ package at.asitplus.wallet.lib.iso
 
 import at.asitplus.catching
 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
 import at.asitplus.wallet.lib.agent.EphemeralKeyWithSelfSignedCert
 import at.asitplus.wallet.lib.agent.Issuer
 import at.asitplus.wallet.lib.agent.IssuerAgent
 import at.asitplus.wallet.lib.data.ConstantIndex
+import io.kotest.assertions.withClue
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.maps.shouldNotBeEmpty
@@ -82,6 +84,7 @@ class Tag24SerializationTest : FreeSpec({
         )
 
         val serialized = vckCborSerializer.encodeToByteArray(input)
+            .also{println(it.encodeToString(Base16Strict))}
 
         serialized.encodeToString(Base16(true)).shouldContainOnlyOnce("D818")
         vckCborSerializer.decodeFromByteArray<IssuerSigned>(serialized) shouldBe input
@@ -98,11 +101,13 @@ class Tag24SerializationTest : FreeSpec({
         ).getOrThrow().shouldBeInstanceOf<Issuer.IssuedCredential.Iso>()
 
         issuedCredential.issuerSigned.namespaces!!.shouldNotBeEmpty()
-        val numberOfClaims = issuedCredential.issuerSigned.namespaces!!.entries.fold(0) { acc, entry ->
+        val numberOfClaims = issuedCredential.issuerSigned.namespaces.entries.fold(0) { acc, entry ->
             acc + entry.value.entries.size
         }
         val serialized = issuedCredential.issuerSigned.serialize().encodeToString(Base16(true))
-        "D818".toRegex().findAll(serialized).toList().shouldHaveSize(numberOfClaims + 1)
+        withClue(serialized) {
+            "D818".toRegex().findAll(serialized).toList().shouldHaveSize(numberOfClaims + 1)
+        }
         // add 1 for MSO in IssuerAuth
     }
 
@@ -116,10 +121,10 @@ class Tag24SerializationTest : FreeSpec({
             validityInfo = ValidityInfo(Clock.System.now(), Clock.System.now(), Clock.System.now())
         )
         val serializedMso = mso.serializeForIssuerAuth()
-        val input = CoseSigned<ByteStringWrapper<MobileSecurityObject>>(
+        val input = CoseSigned<MobileSecurityObject>(
             protectedHeader = ByteStringWrapper(CoseHeader()),
             unprotectedHeader = null,
-            payload = ByteStringWrapper(mso),
+            payload = mso,
             rawSignature = byteArrayOf()
         )
+5 −4		indispensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseSigned.kt
+22 −10		indispensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseSignedSerializer.kt
+1 −1		indispensable-cosef/src/commonTest/kotlin/at/asitplus/signum/indispensable/cosef/CoseEqualsTest.kt
+2 −2		indispensable-josef/src/jvmTest/kotlin/at/asitplus/signum/indispensable/josef/JwkTest.kt