code style fix
Change-Id: I2f57ac1eb9c01063752adfc452ff0f1db3367fe3
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 9af6f28..09b5f68 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -20,9 +20,9 @@
#include "configuration.hpp"
#include "identity-challenge/challenge-module.hpp"
+#include "name-assignment/assignment-func.hpp"
#include <ndn-cxx/util/io.hpp>
#include <boost/filesystem.hpp>
-#include "name-assignment/assignment-func.hpp"
namespace ndn {
namespace ndncert {
diff --git a/src/detail/ca-request-state.hpp b/src/detail/ca-request-state.hpp
index 49c862e..7fa9f23 100644
--- a/src/detail/ca-request-state.hpp
+++ b/src/detail/ca-request-state.hpp
@@ -18,8 +18,8 @@
* See AUTHORS.md for complete list of ndncert authors and contributors.
*/
-#ifndef NDNCERT_DETAIL_CA_STATE_HPP
-#define NDNCERT_DETAIL_CA_STATE_HPP
+#ifndef NDNCERT_DETAIL_CA_REQUEST_STATE_HPP
+#define NDNCERT_DETAIL_CA_REQUEST_STATE_HPP
#include "detail/ndncert-common.hpp"
#include <array>
@@ -146,4 +146,4 @@
} // namespace ndncert
} // namespace ndn
-#endif // NDNCERT_DETAIL_CA_STATE_HPP
+#endif // NDNCERT_DETAIL_CA_REQUEST_STATE_HPP
diff --git a/src/detail/challenge-encoder.hpp b/src/detail/challenge-encoder.hpp
index d0ad429..3eaf4c4 100644
--- a/src/detail/challenge-encoder.hpp
+++ b/src/detail/challenge-encoder.hpp
@@ -18,8 +18,8 @@
* See AUTHORS.md for complete list of ndncert authors and contributors.
*/
-#ifndef NDNCERT_DETAIL_CHALLENGE_STEP_HPP
-#define NDNCERT_DETAIL_CHALLENGE_STEP_HPP
+#ifndef NDNCERT_DETAIL_CHALLENGE_ENCODER_HPP
+#define NDNCERT_DETAIL_CHALLENGE_ENCODER_HPP
#include "detail/ca-request-state.hpp"
#include "requester-state.hpp"
@@ -40,4 +40,4 @@
} // namespace ndncert
} // namespace ndn
-#endif // NDNCERT_DETAIL_CHALLENGE_STEP_HPP
\ No newline at end of file
+#endif // NDNCERT_DETAIL_CHALLENGE_ENCODER_HPP
\ No newline at end of file
diff --git a/src/detail/new-renew-revoke-encoder.cpp b/src/detail/new-renew-revoke-encoder.cpp
index 8ae6a02..577d1de 100644
--- a/src/detail/new-renew-revoke-encoder.cpp
+++ b/src/detail/new-renew-revoke-encoder.cpp
@@ -47,7 +47,8 @@
request.push_back(makeBinaryBlock(tlv::EcdhPub, ecdhPub.data(), ecdhPub.size()));
if (requestType == RequestType::NEW || requestType == RequestType::RENEW) {
request.push_back(makeNestedBlock(tlv::CertRequest, certRequest));
- } else if (requestType == RequestType::REVOKE) {
+ }
+ else if (requestType == RequestType::REVOKE) {
request.push_back(makeNestedBlock(tlv::CertToRevoke, certRequest));
}
request.encode();
diff --git a/src/detail/probe-encoder.cpp b/src/detail/probe-encoder.cpp
index 5141ba1..d6798f9 100644
--- a/src/detail/probe-encoder.cpp
+++ b/src/detail/probe-encoder.cpp
@@ -87,7 +87,8 @@
NDN_THROW(std::runtime_error("Invalid probe format"));
}
elementName.wireDecode(subBlock);
- } else if (subBlock.type() == tlv::MaxSuffixLength) {
+ }
+ else if (subBlock.type() == tlv::MaxSuffixLength) {
maxSuffixLength = readNonNegativeInteger(subBlock);
}
}
diff --git a/src/identity-challenge/challenge-email.cpp b/src/identity-challenge/challenge-email.cpp
index be7cd2a..502885e 100644
--- a/src/identity-challenge/challenge-email.cpp
+++ b/src/identity-challenge/challenge-email.cpp
@@ -55,7 +55,8 @@
}
auto lastComponentRequested = readString(request.m_cert.getIdentity().get(-1));
if (lastComponentRequested != emailAddress) {
- NDN_LOG_TRACE("Email and requested name do not match. Email " << emailAddress << "requested last component " << lastComponentRequested);
+ NDN_LOG_TRACE("Email and requested name do not match. Email " << emailAddress << "requested last component "
+ << lastComponentRequested);
}
std::string emailCode = generateSecretCode();
JsonSection secretJson;
diff --git a/src/identity-challenge/challenge-module.cpp b/src/identity-challenge/challenge-module.cpp
index 2208e83..e58b0aa 100644
--- a/src/identity-challenge/challenge-module.cpp
+++ b/src/identity-challenge/challenge-module.cpp
@@ -87,7 +87,8 @@
{
request.m_status = Status::CHALLENGE;
request.m_challengeType = CHALLENGE_TYPE;
- request.m_challengeState = ca::ChallengeState(challengeStatus, time::system_clock::now(), remainingTries, remainingTime, std::move(challengeSecret));
+ request.m_challengeState = ca::ChallengeState(challengeStatus, time::system_clock::now(), remainingTries, remainingTime,
+ std::move(challengeSecret));
return std::make_tuple(ErrorCode::NO_ERROR, "");
}
diff --git a/src/identity-challenge/challenge-pin.cpp b/src/identity-challenge/challenge-pin.cpp
index 726771f..66f5fec 100644
--- a/src/identity-challenge/challenge-pin.cpp
+++ b/src/identity-challenge/challenge-pin.cpp
@@ -104,7 +104,8 @@
}
Block
-ChallengePin::genChallengeRequestTLV(Status status, const std::string& challengeStatus, std::vector<std::tuple<std::string, std::string>>&& params)
+ChallengePin::genChallengeRequestTLV(Status status, const std::string& challengeStatus,
+ std::vector<std::tuple<std::string, std::string>>&& params)
{
Block request = makeEmptyBlock(tlv::EncryptedPayload);
if (status == Status::BEFORE_CHALLENGE) {
diff --git a/src/name-assignment/assignment-func.hpp b/src/name-assignment/assignment-func.hpp
index 7a45e93..a574d05 100644
--- a/src/name-assignment/assignment-func.hpp
+++ b/src/name-assignment/assignment-func.hpp
@@ -18,8 +18,8 @@
* See AUTHORS.md for complete list of ndncert authors and contributors.
*/
-#ifndef NDNCERT_ASSIGNMENT_FUNCS_HPP
-#define NDNCERT_ASSIGNMENT_FUNCS_HPP
+#ifndef NDNCERT_ASSIGNMENT_FUNC_HPP
+#define NDNCERT_ASSIGNMENT_FUNC_HPP
#include "detail/ca-request-state.hpp"
@@ -82,4 +82,4 @@
} // namespace ndncert
} // namespace ndn
-#endif // NDNCERT_ASSIGNMENT_FUNCS_HPP
+#endif // NDNCERT_ASSIGNMENT_FUNC_HPP
diff --git a/src/name-assignment/assignment-hash.hpp b/src/name-assignment/assignment-hash.hpp
index 3163f79..941ce5a 100644
--- a/src/name-assignment/assignment-hash.hpp
+++ b/src/name-assignment/assignment-hash.hpp
@@ -42,4 +42,4 @@
} // namespace ndncert
} // namespace ndn
-#endif //NDNCERT_ASSIGNMENT_HASH_HPP
+#endif // NDNCERT_ASSIGNMENT_HASH_HPP
diff --git a/src/name-assignment/assignment-param.hpp b/src/name-assignment/assignment-param.hpp
index 5e60dc1..dc45e03 100644
--- a/src/name-assignment/assignment-param.hpp
+++ b/src/name-assignment/assignment-param.hpp
@@ -40,4 +40,4 @@
} // namespace ndncert
} // namespace ndn
-#endif //NDNCERT_ASSIGNMENT_PARAM_HPP
+#endif // NDNCERT_ASSIGNMENT_PARAM_HPP
diff --git a/src/name-assignment/assignment-random.cpp b/src/name-assignment/assignment-random.cpp
index 7b24481..59f6477 100644
--- a/src/name-assignment/assignment-random.cpp
+++ b/src/name-assignment/assignment-random.cpp
@@ -38,5 +38,5 @@
return resultList;
}
-}
-}
+} // namespace ndncert
+} // namespace ndn
diff --git a/src/name-assignment/assignment-random.hpp b/src/name-assignment/assignment-random.hpp
index c65cd5d..93e288d 100644
--- a/src/name-assignment/assignment-random.hpp
+++ b/src/name-assignment/assignment-random.hpp
@@ -41,4 +41,4 @@
} // namespace ndncert
} // namespace ndn
-#endif //NDNCERT_ASSIGNMENT_RANDOM_HPP
+#endif // NDNCERT_ASSIGNMENT_RANDOM_HPP
diff --git a/tests/unit-tests/challenge-credential.t.cpp b/tests/unit-tests/challenge-credential.t.cpp
index 93a52d0..38b77bb 100644
--- a/tests/unit-tests/challenge-credential.t.cpp
+++ b/tests/unit-tests/challenge-credential.t.cpp
@@ -66,7 +66,8 @@
credential.setName(credentialName);
credential.setContent(keyB.getPublicKey().data(), keyB.getPublicKey().size());
SignatureInfo signatureInfo;
- signatureInfo.setValidityPeriod(security::ValidityPeriod(time::system_clock::now(), time::system_clock::now() + time::minutes(1)));
+ signatureInfo.setValidityPeriod(security::ValidityPeriod(time::system_clock::now(), time::system_clock::now() +
+ time::minutes(1)));
m_keyChain.sign(credential, signingByCertificate(trustAnchor).setSignatureInfo(signatureInfo));
m_keyChain.addCertificate(keyB, credential);
diff --git a/tests/unit-tests/protocol-encoders.t.cpp b/tests/unit-tests/protocol-encoders.t.cpp
index 0131e83..f2411f1 100644
--- a/tests/unit-tests/protocol-encoders.t.cpp
+++ b/tests/unit-tests/protocol-encoders.t.cpp
@@ -171,6 +171,6 @@
BOOST_AUTO_TEST_SUITE_END()
-} // namespace tests
-} // namespace ndncert
-} // namespace ndn
+} // namespace tests
+} // namespace ndncert
+} // namespace ndn