commit 666b2717e457b1671e669da0a3d81b570466ec0a
author Hasini Gunasinghe <hasinitg@google.com> Thu Jan 05 21:35:51 2023 +0000
committer Hasini Gunasinghe <hasinitg@google.com> Thu Jan 05 21:35:51 2023 +0000
tree 0458c96f15f93b01fb8c53f47bdda874c38243d8
parent 451350985a5c20149431725566091f67bc030e8e

Fix VtsRemotelyProvisionedComponentTests for IRPC V3

This updates the test: supportsValidCurve, for IRPC implementations
that supports only V3+.

Bug: 239476788
Test: atest VtsRemotelyProvisionedComponentTests with IRPC V3
implementation

Change-Id: Ic0f1223b30e31dc537155e19e800b3001ce0fc01

security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

diff --git a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
index aebcf67..bbda56d 100644
--- a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
+++ b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
@@ -223,6 +223,20 @@
     ASSERT_TRUE(provisionable_->getHardwareInfo(&hwInfo).isOk());
 
     const std::set<int> validCurves = {RpcHardwareInfo::CURVE_P256, RpcHardwareInfo::CURVE_25519};
+    // First check for the implementations that supports only IRPC V3+.
+    if (rpcHardwareInfo.versionNumber >= VERSION_WITHOUT_TEST_MODE) {
+        bytevec keysToSignMac;
+        DeviceInfo deviceInfo;
+        ProtectedData protectedData;
+        auto status = provisionable_->generateCertificateRequest(false, {}, {}, {}, &deviceInfo,
+                                                                 &protectedData, &keysToSignMac);
+        if (!status.isOk() &&
+            (status.getServiceSpecificError() == BnRemotelyProvisionedComponent::STATUS_REMOVED)) {
+            ASSERT_EQ(hwInfo.supportedEekCurve, RpcHardwareInfo::CURVE_NONE)
+                    << "Invalid curve: " << hwInfo.supportedEekCurve;
+            return;
+        }
+    }
     ASSERT_EQ(validCurves.count(hwInfo.supportedEekCurve), 1)
             << "Invalid curve: " << hwInfo.supportedEekCurve;
 }