Test the attestation CDI as well as the sealing CDI
Both CDIs should be different for different instances of the same VM so
also check that is true in the test.
Bug: 218935426
Test: atest MicrodroidTests
Change-Id: Ic150a8da6040613c58bfcf433d65a8c69b263146
diff --git a/tests/testapk/src/native/testbinary.cpp b/tests/testapk/src/native/testbinary.cpp
index 417ff4a..76df5be 100644
--- a/tests/testapk/src/native/testbinary.cpp
+++ b/tests/testapk/src/native/testbinary.cpp
@@ -79,7 +79,7 @@
return ndk::ScopedAStatus::ok();
}
- ndk::ScopedAStatus insecurelyExposeSecret(std::vector<uint8_t>* out) override {
+ ndk::ScopedAStatus insecurelyExposeSealingCdi(std::vector<uint8_t>* out) override {
ndk::SpAIBinder binder(AServiceManager_getService("android.security.dice.IDiceNode"));
auto service = IDiceNode::fromBinder(binder);
if (service == nullptr) {
@@ -95,6 +95,23 @@
*out = {handover.cdiSeal.begin(), handover.cdiSeal.end()};
return ndk::ScopedAStatus::ok();
}
+
+ ndk::ScopedAStatus insecurelyExposeAttestationCdi(std::vector<uint8_t>* out) override {
+ ndk::SpAIBinder binder(AServiceManager_getService("android.security.dice.IDiceNode"));
+ auto service = IDiceNode::fromBinder(binder);
+ if (service == nullptr) {
+ return ndk::ScopedAStatus::
+ fromServiceSpecificErrorWithMessage(0, "Failed to find diced");
+ }
+ BccHandover handover;
+ auto deriveStatus = service->derive({}, &handover);
+ if (!deriveStatus.isOk()) {
+ return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(0,
+ "Failed call diced");
+ }
+ *out = {handover.cdiAttest.begin(), handover.cdiAttest.end()};
+ return ndk::ScopedAStatus::ok();
+ }
};
auto testService = ndk::SharedRefBase::make<TestService>();