commit 086dacaa7bc296a4be677d6145f90c4975b5051e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 19 01:31:05 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 19 01:31:05 2024 +0000
tree 262f59af0c546e0044bafce884baef9b7744b735
parent fef3342c80f619b91370e158b3a54c5be5250060
parent 707174bdb56c0c6c9c6903b86f6f7705777c5338

Snap for 12524026 from 707174bdb56c0c6c9c6903b86f6f7705777c5338 to 25Q1-release

Change-Id: Ifcf11c30d4eaa715b89d0620d2bfd4aa6e7a13f2

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index f50c052..88b674e 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -175,6 +175,12 @@
     aconfig_declarations: "keystore2_flags",
 }
 
+java_aconfig_library {
+    name: "keystore2_flags_java-host",
+    aconfig_declarations: "keystore2_flags",
+    host_supported: true,
+}
+
 rust_aconfig_library {
     name: "libkeystore2_flags_rust",
     crate_name: "keystore2_flags",

provisioner/rkp_factory_extraction_lib.cpp

diff --git a/provisioner/rkp_factory_extraction_lib.cpp b/provisioner/rkp_factory_extraction_lib.cpp
index 2c2614d..37b81fd 100644
--- a/provisioner/rkp_factory_extraction_lib.cpp
+++ b/provisioner/rkp_factory_extraction_lib.cpp
@@ -191,9 +191,9 @@
         exit(-1);
     }
 
-    auto result = verifyFactoryProtectedData(verifiedDeviceInfo, /*keysToSign=*/{}, keysToSignMac,
-                                             protectedData, *eekChain, eekId,
-                                             hwInfo.supportedEekCurve, irpc, challenge);
+    auto result = verifyFactoryProtectedData(
+        verifiedDeviceInfo, /*keysToSign=*/{}, keysToSignMac, protectedData, *eekChain, eekId,
+        hwInfo.supportedEekCurve, irpc, std::string(componentName), challenge);
 
     if (!result) {
         std::cerr << "Self test failed for IRemotelyProvisionedComponent '" << componentName
@@ -238,8 +238,8 @@
     }
 
     if (selfTest) {
-        auto result =
-            verifyFactoryCsr(/*keysToSign=*/cppbor::Array(), csr, irpc, challenge, allowDegenerate);
+        auto result = verifyFactoryCsr(/*keysToSign=*/cppbor::Array(), csr, irpc,
+                                       std::string(componentName), challenge, allowDegenerate);
         if (!result) {
             std::cerr << "Self test failed for IRemotelyProvisionedComponent '" << componentName
                       << "'. Error message: '" << result.message() << "'." << std::endl;