WIP

Author: Pflanzmann

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/transfer/openid4vp/responseGenerator/OpenId4VpSdJwtResponseGeneratorImpl.kt

@@ -1,5 +1,7 @@
 package eu.europa.ec.eudi.wallet.transfer.openid4vp.responseGenerator
 
+import android.os.Build
+import android.security.keystore.KeyProperties
 import com.nimbusds.jose.JWSAlgorithm
 import com.nimbusds.jose.JWSHeader
 import com.nimbusds.jose.crypto.ECDSASigner
@@ -32,6 +34,7 @@ import eu.europa.ec.eudi.sdjwt.serializeWithKeyBinding
 import eu.europa.ec.eudi.wallet.internal.Openid4VpX509CertificateTrust
 import eu.europa.ec.eudi.wallet.issue.openid4vci.DocumentManagerSdJwt
 import eu.europa.ec.eudi.wallet.keystore.DEV_KEY_ALIAS
+import eu.europa.ec.eudi.wallet.keystore.KeyGenerator
 import eu.europa.ec.eudi.wallet.keystore.KeyGeneratorImpl
 import eu.europa.ec.eudi.wallet.transfer.openid4vp.OpenId4VpSdJwtRequest
 import kotlinx.coroutines.runBlocking
@@ -61,7 +64,17 @@ class OpenId4VpSdJwtResponseGeneratorImpl(
 
         val presentationSdJwt = sdJwt.present(jsonPointer)
 
-        val ecKey = ECKey.load(KeyGeneratorImpl.getKeyStore(), DEV_KEY_ALIAS, null)
+//        val ecKey = ECKey.load(KeyGeneratorImpl.getKeyStore(), DEV_KEY_ALIAS, null)
+
+        val key= if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            KeyGeneratorImpl.getSigningKey(KeyGenerator.SigningKeyConfig(KeyProperties.AUTH_DEVICE_CREDENTIAL,60))
+        } else {
+            throw Exception()
+        }
+        val pemString = "-----BEGIN CERTIFICATE-----\n" +
+                "${key.privateKey}\n" +
+                "-----END CERTIFICATE-----"
+        val ecKey = ECKey.parse(pemString)
 
         val signer = ECDSASigner(ecKey)
 
@@ -160,13 +173,13 @@ class OpenId4VpSdJwtResponseGeneratorImpl(
         val keyString = headerJson.getJSONArray("x5c").getString(0).replace("\n", "")
         println(keyString)
 
-        val key2 = "-----BEGIN CERTIFICATE-----\n" +
+        val pemString = "-----BEGIN CERTIFICATE-----\n" +
                 "${keyString}\n" +
                 "-----END CERTIFICATE-----"
 
         val certificateFactory: CertificateFactory = CertificateFactory.getInstance("X.509")
         val certificate =
-            certificateFactory.generateCertificate(ByteArrayInputStream(key2.toByteArray())) as X509Certificate
+            certificateFactory.generateCertificate(ByteArrayInputStream(pemString.toByteArray())) as X509Certificate
 
         val ecKey = ECKey.parse(certificate)
         val jwtSignatureVerifier = ECDSAVerifier(ecKey).asJwtVerifier()