Change VerifyJwsObjectFun return type to KmmResult

Author: n0900

CHANGELOG.md

@@ -1,13 +1,12 @@
 # Changelog
 
 Release 5.10.0 (Unreleased)
- - Make `VerifyJwsObject` return `Result<Unit>` and propagate verification failures with descriptive errors across OAuth/OID flows and validators
- - StatusListToken:
+ - Make `VerifyJwsObject` return `KmmResult<Unit>` and propagate verification failures with descriptive errors
    - Remove `StatusTokenValidator`
    - Remove `StatusTokenIntegrityValidator` class
    - Refactor `StatusListToken.StatusListJwt` to `StatusListJwt`
    - Refactor `StatusListToken.StatusListCwt` to `StatusListCwt`
-   - Add `VerifyStatusListTokenHAIP` and related resolver/tests to enforce HAIP D05 certificate chain rules for status list JWTs
+   - Add `VerifyStatusListTokenHAIP` and related resolver/tests to enforce HAIP d04 certificate chain rules for status list JWTs
  - OAuth 2.0:
    - Use correct path for metadata retrieval (inserting strings between host component and path component)
    - Support reading resource-server provided nonce for [OAuth 2.0 Demonstrating Proof of Possession (DPoP)](https://datatracker.ietf.org/doc/html/rfc9449)

vck/src/commonMain/kotlin/at/asitplus/wallet/lib/jws/JwsService.kt

@@ -2,7 +2,6 @@ package at.asitplus.wallet.lib.jws
 
 import at.asitplus.KmmResult
 import at.asitplus.catching
-import at.asitplus.catchingUnwrapped
 import at.asitplus.signum.indispensable.CryptoPublicKey
 import at.asitplus.signum.indispensable.Digest
 import at.asitplus.signum.indispensable.KeyAgreementPrivateValue
@@ -570,7 +569,7 @@ class VerifyStatusListTokenHAIP(
     val trustStoreLookup: TrustStoreLookup = TrustStoreLookup { null },
 ) : VerifyJwsObjectFun {
 
-    override suspend operator fun invoke(jwsObject: JwsSigned<*>) = catchingUnwrapped {
+    override suspend operator fun invoke(jwsObject: JwsSigned<*>) = catching {
         val trustStore: Set<X509Certificate>? = trustStoreLookup(jwsObject)
         val certChain: CertificateChain? = jwsObject.header.certificateChain
         val signingCert: X509Certificate = certChain?.first() ?: throw Exception("Certificate Chain MUST not be empty")
@@ -611,7 +610,7 @@ class VerifyStatusListTokenHAIP(
 fun interface VerifyJwsObjectFun {
     suspend operator fun invoke(
         jwsObject: JwsSigned<*>,
-    ): Result<Unit>
+    ): KmmResult<Unit>
 }
 
 class VerifyJwsObject(
@@ -624,7 +623,7 @@ class VerifyJwsObject(
     /** Need to implement if valid keys for JWS are transported somehow out-of-band, e.g. provided by a trust store */
     val publicKeyLookup: PublicJsonWebKeyLookup = PublicJsonWebKeyLookup { null },
 ) : VerifyJwsObjectFun {
-    override suspend operator fun invoke(jwsObject: JwsSigned<*>) = catchingUnwrapped {
+    override suspend operator fun invoke(jwsObject: JwsSigned<*>) = catching {
         require(jwsObject.loadPublicKeys().any { verifyJwsSignature(jwsObject, it).isSuccess }) {
             "Invalid Signature"
         }