OpenID4VPHandover updated to follow OpenID4VP 1.0

Author: marinaioannou

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/internal/OpenId4VpUtils.kt

@@ -101,37 +101,39 @@ private const val SHA_256_ALGORITHM = "SHA-256"
  *  EReaderKeyBytes = null
  *
  *  Handover = OID4VPHandover
- *  OID4VPHandover = [
- *    clientIdHash
- *    responseUriHash
- *    nonce
- *  ]
- *
- *  clientIdHash = bstr
- *  responseUriHash = bstr
  *
- *  where clientIdHash is the SHA-256 hash of clientIdToHash and responseUriHash is the SHA-256 hash of the responseUriToHash.
+ *  OpenID4VPHandover = [
+ *    "OpenID4VPHandover",      ; A fixed identifier for this handover type
+ *    OpenID4VPHandoverInfoHash ; A cryptographic hash of OpenID4VPHandoverInfo
+ *  ]
  *
+ *  ; Contains the sha-256 hash of OpenID4VPHandoverInfoBytes
+ *  OpenID4VPHandoverInfoHash = bstr
  *
- *  clientIdToHash = [clientId, mdocGeneratedNonce]
- *  responseUriToHash = [responseUri, mdocGeneratedNonce]
+ *  ; Contains the bytes of OpenID4VPHandoverInfo encoded as CBOR
+ *  OpenID4VPHandoverInfoBytes = bstr .cbor OpenID4VPHandoverInfo
  *
+ *  OpenID4VPHandoverInfo = [
+ *    clientId,
+ *    nonce,
+ *    jwkThumbprint,
+ *    responseUri
+ *  ] ; Array containing handover parameters
  *
- *  mdocGeneratedNonce = tstr
  *  clientId = tstr
- *  responseUri = tstr
  *  nonce = tstr
- *
+ *  jwkThumbprint = bstr
+ *  responseUri = tstr
  */
 internal fun generateSessionTranscript(
     clientId: String,
-    responseUri: String,
     nonce: String,
-    mdocGeneratedNonce: String,
+    jwkThumbprint: ByteArray?,
+    responseOrRedirectUri: String
 ): SessionTranscriptBytes {
 
     val openID4VPHandover =
-        generateOpenId4VpHandover(clientId, responseUri, nonce, mdocGeneratedNonce)
+        generateOpenId4VpHandover(clientId, nonce, jwkThumbprint, responseOrRedirectUri)
 
     val sessionTranscriptBytes =
         CBORObject.NewArray().apply {
@@ -144,38 +146,36 @@ internal fun generateSessionTranscript(
 }
 
 /**
- * Generates the OpenID4VP handover CBOR object containing clientId hash, responseUri hash, and nonce.
+ * Generates the OpenID4VP handover CBOR object
  *
  * @param clientId The client identifier.
- * @param responseUri The response URI.
- * @param nonce The nonce for the session.
- * @param mdocGeneratedNonce The generated nonce for mdoc.
- * @return The handover as a CBORObject.
+ * @param nonce The nonce value.
+ * @param jwkThumbprint The JWK thumbprint as a byte array.
+ * @param responseOrRedirectUri The response URI or redirect URI.
+ * @return The CBOR object representing the OpenID4VP handover.
  */
 internal fun generateOpenId4VpHandover(
     clientId: String,
-    responseUri: String,
     nonce: String,
-    mdocGeneratedNonce: String,
+    jwkThumbprint: ByteArray?,
+    responseOrRedirectUri: String,
 ): CBORObject {
-    val clientIdToHash = CBORObject.NewArray().apply {
-        Add(clientId)
-        Add(mdocGeneratedNonce)
-    }.EncodeToBytes()
 
-    val responseUriToHash = CBORObject.NewArray().apply {
-        Add(responseUri)
-        Add(mdocGeneratedNonce)
+    val openID4VPHandoverInfoBytes = CBORObject.NewArray().apply {
+        Add(clientId)
+        Add(nonce)
+        Add(jwkThumbprint ?: CBORObject.Null)
+        Add(responseOrRedirectUri)
     }.EncodeToBytes()
 
-    val clientIdHash = MessageDigest.getInstance(SHA_256_ALGORITHM).digest(clientIdToHash)
-    val responseUriHash = MessageDigest.getInstance(SHA_256_ALGORITHM).digest(responseUriToHash)
+    val openID4VPHandoverInfoHash = MessageDigest.getInstance(SHA_256_ALGORITHM)
+        .digest(openID4VPHandoverInfoBytes)
 
     val openID4VPHandover = CBORObject.NewArray().apply {
-        Add(clientIdHash)
-        Add(responseUriHash)
-        Add(nonce)
+        Add("OpenID4VPHandover")
+        Add(openID4VPHandoverInfoHash)
     }
+
     return openID4VPHandover
 }
 
@@ -232,24 +232,25 @@ internal fun makeOpenId4VPConfig(
 /**
  * Extension function to get the session transcript bytes from a resolved OpenID4VP authorization request.
  *
- * @param mdocGeneratedNonce The generated nonce for mdoc.
  * @return The session transcript as a byte array.
  */
-internal fun ResolvedRequestObject.getSessionTranscriptBytes(
-    mdocGeneratedNonce: String,
-): SessionTranscriptBytes {
-    val clientId = this.client.id.clientId
-    val responseUri = when (val mode = this.responseMode) {
+internal fun ResolvedRequestObject.getSessionTranscriptBytes(): SessionTranscriptBytes {
+    val clientId = client.id.clientId
+    val nonce = nonce
+    val jwkThumbprint = responseEncryptionSpecification?.recipientKey?.computeThumbprint()?.decode()
+    val responseOrRedirectUri = when (val mode = this.responseMode) {
         is ResponseMode.DirectPostJwt -> mode.responseURI.toString()
-        else -> ""
+        is ResponseMode.DirectPost -> mode.responseURI.toString()
+        is ResponseMode.Fragment -> mode.redirectUri.toString()
+        is ResponseMode.FragmentJwt -> mode.redirectUri.toString()
+        is ResponseMode.Query -> mode.redirectUri.toString()
+        is ResponseMode.QueryJwt -> mode.redirectUri.toString()
     }
-    val nonce = this.nonce
-
     val sessionTranscriptBytes = generateSessionTranscript(
-        clientId,
-        responseUri,
-        nonce,
-        mdocGeneratedNonce
+        clientId = clientId,
+        nonce = nonce,
+        jwkThumbprint = jwkThumbprint,
+        responseOrRedirectUri = responseOrRedirectUri
     )
     return sessionTranscriptBytes
 }

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/transfer/openId4vp/dcql/ProcessedDcqlRequest.kt

@@ -170,11 +170,11 @@ class ProcessedDcqlRequest(
         // Generate the appropriate verifiable presentation based on format
         val vp = when (format) {
             FORMAT_MSO_MDOC -> {
-                // For MSO mdoc, include session transcript and handle devic engagement
+                // For MSO mdoc, include session transcript and handle device engagement
                 verifiablePresentationForMsoMdoc(
                     documentManager = documentManager,
                     sessionTranscript = resolvedRequestObject
-                        .getSessionTranscriptBytes(msoMdocNonce),
+                        .getSessionTranscriptBytes(),
                     disclosedDocument = disclosedDocument,
                     requestedDocuments = requestedDocuments,
                     signatureAlgorithm = signatureAlgorithm

wallet-core/src/test/java/eu/europa/ec/eudi/wallet/internal/Openid4VpUtilsTest.kt

@@ -35,6 +35,7 @@ package eu.europa.ec.eudi.wallet.internal
 //import eu.europa.ec.eudi.wallet.transfer.openId4vp.JwsAlgorithm
 //import eu.europa.ec.eudi.wallet.transfer.openId4vp.OpenId4VpConfig
 //import eu.europa.ec.eudi.wallet.transfer.openId4vp.OpenId4VpReaderTrust
+import com.nimbusds.jose.jwk.JWK
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.OpenId4VpReaderTrustImpl
 import org.bouncycastle.util.encoders.Hex
 import kotlin.test.Test
@@ -43,42 +44,54 @@ import kotlin.test.assertEquals
 
 /**
  *    Examples has been taken from:
- *    https://github.com/awoie/annex-b-examples/pull/2
- *    https://github.com/awoie/annex-b-examples/blob/main/examples/annex-b-examples.txt
+ *    https://openid.net/specs/openid-4-verifiable-presentations-1_0.html#name-handover-and-sessiontranscr
  */
 
-const val ANNEX_B_OPENID4VP_HANDOVER =
-    "835820DA25C527E5FB75BC2DD31267C02237C4462BA0C1BF37071F692E7DD93B10AD0B5820F6ED8E3220D3C59A5F17EB45F48AB70AEECF9EE21744B1014982350BD96AC0C572616263646566676831323334353637383930"
-const val ANNEX_B_SESSION_TRANSCRIPT =
-    "83F6F6835820DA25C527E5FB75BC2DD31267C02237C4462BA0C1BF37071F692E7DD93B10AD0B5820F6ED8E3220D3C59A5F17EB45F48AB70AEECF9EE21744B1014982350BD96AC0C572616263646566676831323334353637383930"
+const val OPENID4VP_1_0_HANDOVER =
+    "82714f70656e494434565048616e646f7665725820048bc053c00442af9b8eed494cefdd9d95240d254b046b11b68013722aad38ac"
+const val OPENID4VP_1_0_SESSION_TRANSCRIPT =
+    "83f6f682714f70656e494434565048616e646f7665725820048bc053c00442af9b8eed494cefdd9d95240d254b046b11b68013722aad38ac"
 
-const val clientId = "example.com"
-const val responseUri = "https://example.com/12345/response"
-const val nonce = "abcdefgh1234567890"
-const val mdocGeneratedNonce = "1234567890abcdefgh"
+const val clientId = "x509_san_dns:example.com"
+const val nonce = "exc7gBkxjx1rdc9udRrveKvSsJIq80avlXeLHhGwqtA"
+const val jwk = """
+    {
+      "kty": "EC",
+      "crv": "P-256",
+      "x": "DxiH5Q4Yx3UrukE2lWCErq8N8bqC9CHLLrAwLz5BmE0",
+      "y": "XtLM4-3h5o3HUH0MHVJV0kyq0iBlrBwlh8qEDMZ4-Pc",
+      "use": "enc",
+      "alg": "ECDH-ES",
+      "kid": "1"
+    }
+    """
+const val responseUri = "https://example.com/response"
 
 class Openid4VpUtilsTest {
 
     @Test
     fun testGenerateOpenId4VpHandover() {
         val openid4VpHandover = generateOpenId4VpHandover(
-            clientId,
-            responseUri,
-            nonce,
-            mdocGeneratedNonce
+            clientId = clientId,
+            nonce = nonce,
+            jwkThumbprint = JWK.parse(jwk).computeThumbprint().decode(),
+            responseOrRedirectUri = responseUri
         ).EncodeToBytes()
-        assertEquals(ANNEX_B_OPENID4VP_HANDOVER, Hex.toHexString(openid4VpHandover).uppercase())
+        assertEquals(OPENID4VP_1_0_HANDOVER, Hex.toHexString(openid4VpHandover).lowercase())
     }
 
     @Test
     fun testGenerateSessionTranscript() {
         val sessionTranscript = generateSessionTranscript(
-            clientId,
-            responseUri,
-            nonce,
-            mdocGeneratedNonce
+            clientId = clientId,
+            nonce = nonce,
+            jwkThumbprint = JWK.parse(jwk).computeThumbprint().decode(),
+            responseOrRedirectUri = responseUri
+        )
+        assertEquals(
+            OPENID4VP_1_0_SESSION_TRANSCRIPT,
+            Hex.toHexString(sessionTranscript).lowercase()
         )
-        assertEquals(ANNEX_B_SESSION_TRANSCRIPT, Hex.toHexString(sessionTranscript).uppercase())
     }
 
     @Test