commit cc6889de476c20faa52962f447cb99cbc26c1f6d
author Junxiao Shi <git@mail1.yoursunny.com> Sun Apr 24 21:49:01 2022 +0000
committer Davide Pesavento <davidepesa@gmail.com> Tue Apr 26 01:19:24 2022 -0400
tree 226859ca15bfe82cfbee791d3ea2259183a1ab16
parent b5d3a4f40d14b462d4522390f5d63df59be730cb

challenge: accommodate certificate name in KeyLocator

refs #5112

Change-Id: Id30a54682b356b93245771ae1cc33ef4962050d1

src/challenge/challenge-possession.cpp

diff --git a/src/challenge/challenge-possession.cpp b/src/challenge/challenge-possession.cpp
index 2299a51..7c2b30a 100644
--- a/src/challenge/challenge-possession.cpp
+++ b/src/challenge/challenge-possession.cpp
@@ -115,22 +115,16 @@
     using ndn::toHex;
 
     // check the certificate
-    bool checkOK = false;
-    if (credential.hasContent() && signatureLen == 0) {
-      Name signingKeyName = credential.getSignatureInfo().getKeyLocator().getName();
-      ndn::security::transform::PublicKey key;
-      key.loadPkcs8(credential.getPublicKey());
-      for (const auto& anchor : m_trustAnchors) {
-        if (anchor.getKeyName() == signingKeyName) {
-          if (ndn::security::verifySignature(credential, anchor)) {
-            checkOK = true;
-          }
-        }
-      }
-    }
-    else {
+    if (!credential.hasContent() || signatureLen != 0) {
       return returnWithError(request, ErrorCode::BAD_INTEREST_FORMAT, "Cannot find certificate");
     }
+    auto keyLocator = credential.getSignatureInfo().getKeyLocator().getName();
+    ndn::security::transform::PublicKey key;
+    key.loadPkcs8(credential.getPublicKey());
+    bool checkOK = std::any_of(m_trustAnchors.begin(), m_trustAnchors.end(), [&] (const auto& anchor) {
+      return (anchor.getKeyName() == keyLocator || anchor.getName() == keyLocator) &&
+             ndn::security::verifySignature(credential, anchor);
+    });
     if (!checkOK) {
       return returnWithError(request, ErrorCode::INVALID_PARAMETER, "Certificate cannot be verified");
     }