commit d9cf298536cd2b229eedfdecf2ccb46590098111
author Priyanka Advani (xWF) <padvani@google.com> Mon Sep 09 20:44:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 09 20:44:22 2024 +0000
tree 5d29b88bf865894c6a2ede804097e2607b202db3
parent fbfc9399d4e521d9ee83db1dc5db75b53320e0ef

Revert "Add an option to allow/disallow degenerate DICE chains"

Revert submission 3254876-disallow_degenerate_chains

Reason for revert: Droidmonitor created revert due to b/365592588.

Reverted changes: /q/submissionid:3254876-disallow_degenerate_chains

Change-Id: Iae6ae388cba30036a76a795a510d0c85bf8b2d36

provisioner/rkp_factory_extraction_lib.cpp

diff --git a/provisioner/rkp_factory_extraction_lib.cpp b/provisioner/rkp_factory_extraction_lib.cpp
index 2c2614d..ec70d08 100644
--- a/provisioner/rkp_factory_extraction_lib.cpp
+++ b/provisioner/rkp_factory_extraction_lib.cpp
@@ -224,8 +224,7 @@
 }
 
 CborResult<cppbor::Array> getCsrV3(std::string_view componentName,
-                                   IRemotelyProvisionedComponent* irpc, bool selfTest,
-                                   bool allowDegenerate) {
+                                   IRemotelyProvisionedComponent* irpc, bool selfTest) {
     std::vector<uint8_t> csr;
     std::vector<MacedPublicKey> emptyKeys;
     const std::vector<uint8_t> challenge = generateChallenge();
@@ -238,8 +237,7 @@
     }
 
     if (selfTest) {
-        auto result =
-            verifyFactoryCsr(/*keysToSign=*/cppbor::Array(), csr, irpc, challenge, allowDegenerate);
+        auto result = verifyFactoryCsr(/*keysToSign=*/cppbor::Array(), csr, irpc, challenge);
         if (!result) {
             std::cerr << "Self test failed for IRemotelyProvisionedComponent '" << componentName
                       << "'. Error message: '" << result.message() << "'." << std::endl;
@@ -251,7 +249,7 @@
 }
 
 CborResult<Array> getCsr(std::string_view componentName, IRemotelyProvisionedComponent* irpc,
-                         bool selfTest, bool allowDegenerate) {
+                         bool selfTest) {
     RpcHardwareInfo hwInfo;
     auto status = irpc->getHardwareInfo(&hwInfo);
     if (!status.isOk()) {
@@ -266,7 +264,7 @@
         }
         return getCsrV1(componentName, irpc);
     } else {
-        return getCsrV3(componentName, irpc, selfTest, allowDegenerate);
+        return getCsrV3(componentName, irpc, selfTest);
     }
 }