commit 02ac22c3899a4c48b9ab510c30c29a020939b149
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Sep 28 18:01:03 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Sep 28 18:01:03 2020 -0700
tree f185defbdcccf2bbd628f0dfad4b22e6eecf46ef
parent aafc55e7cc2156ef34128d247cfb77c848cca928

a missing conflit

Change-Id: I3afa8ca3a9d08d6483dafe55109f69de3ba9e86b

src/ca-module.cpp

diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 2a9b5d7..c9a52c7 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -303,17 +303,11 @@
     }
 
     // verify the self-signed certificate, the request, and the token
-<<<<<<< HEAD
     if (!m_config.m_caPrefix.isPrefixOf(clientCert->getName()) // under ca prefix
         || !security::v2::Certificate::isValidName(clientCert->getName()) // is valid cert name
         || clientCert->getName().size() < m_config.m_caPrefix.size() + IS_SUBNAME_MIN_OFFSET
         || clientCert->getName().size() >
                 m_config.m_caPrefix.size() + IS_SUBNAME_MIN_OFFSET - 1 + m_config.m_maxSuffixLength) {
-=======
-    if (!m_config.m_caPrefix.isPrefixOf(clientCert->getName())             // under ca prefix
-        || !security::v2::Certificate::isValidName(clientCert->getName())  // is valid cert name
-        || clientCert->getName().size() < m_config.m_caPrefix.size() + IS_SUBNAME_MIN_OFFSET) {
->>>>>>> apply Error Data packet in challenge status
       _LOG_ERROR("Invalid self-signed certificate name " << clientCert->getName());
       return;
     }
@@ -341,17 +335,11 @@
     }
 
     // verify the certificate
-<<<<<<< HEAD
     if (!m_config.m_caPrefix.isPrefixOf(clientCert->getName()) // under ca prefix
         || !security::v2::Certificate::isValidName(clientCert->getName()) // is valid cert name
         || clientCert->getName().size() < m_config.m_caPrefix.size() + IS_SUBNAME_MIN_OFFSET
         || clientCert->getName().size() >
                 m_config.m_caPrefix.size() + IS_SUBNAME_MIN_OFFSET - 1 + m_config.m_maxSuffixLength) {
-=======
-    if (!m_config.m_caPrefix.isPrefixOf(clientCert->getName())             // under ca prefix
-        || !security::v2::Certificate::isValidName(clientCert->getName())  // is valid cert name
-        || clientCert->getName().size() < m_config.m_caPrefix.size() + IS_SUBNAME_MIN_OFFSET) {
->>>>>>> apply Error Data packet in challenge status
       _LOG_ERROR("Invalid certificate name " << clientCert->getName());
       return;
     }