Change: Move public key from CoseSigned to CoseHeader

a-sit-plus · Dec 12, 2024 · 0a3c25a · 0a3c25a
1 parent 27b32a2
commit 0a3c25a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/...pensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseHeader.kt b/...pensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseHeader.kt
@@ -3,6 +3,7 @@ package at.asitplus.signum.indispensable.cosef
 import at.asitplus.catching
 import at.asitplus.signum.indispensable.cosef.io.Base16Strict
 import at.asitplus.signum.indispensable.cosef.io.coseCompliantSerializer
+import at.asitplus.signum.indispensable.pki.X509Certificate
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
@@ -131,6 +132,23 @@ data class CoseHeader(
     @SerialName("typ")
     val type: String? = null,
 ) {
+    /**
+     * Tries to compute a public key in descending order from [jsonWebKey], [keyId],
+     * or [certificateChain], and takes the first success or null.
+     */
+
+    /**
+     * Tries to compute a public key in descending order from [coseKey] or [certificateChain],
+     * and takes the first success or null.
+     */
+    val publicKey: CoseKey?
+        get() = coseKey?.let { CoseKey.deserialize(it).getOrNull() }
+            ?: kid?.let { CoseKey.fromDid(it.decodeToString()) }?.getOrNull()
+            ?: certificateChain?.let {
+                runCatching {
+                    X509Certificate.decodeFromDer(it)
+                }.getOrNull()?.publicKey?.toCoseKey()?.getOrThrow()
+            }
 
     fun serialize() = coseCompliantSerializer.encodeToByteArray(this)
 

diff --git a/...pensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseSigned.kt b/...pensable-cosef/src/commonMain/kotlin/at/asitplus/signum/indispensable/cosef/CoseSigned.kt
@@ -115,21 +115,6 @@ data class CoseSigned<P : Any?> internal constructor(
             )
         }
 
-    /**
-     * Tries to compute a public key in descending order from [coseKey] or [certificateChain],
-     * and takes the first success or null.
-     */
-    val publicKey: CoseKey?
-        get() = combinedCoseHeader.run {
-            coseKey?.let { CoseKey.deserialize(it).getOrNull() }
-                ?: kid?.let { CoseKey.fromDid(it.decodeToString()) }?.getOrNull()
-                ?: certificateChain?.let {
-                    runCatching {
-                        X509Certificate.decodeFromDer(it)
-                    }.getOrNull()?.publicKey?.toCoseKey()?.getOrThrow()
-                }
-        }
-
     companion object {
         fun <P : Any> deserialize(
             parameterSerializer: KSerializer<P>,