fix warnings
Change-Id: I23aa29d8cb2ddc77d86aee14c5e99f6c3945029b
diff --git a/src/requester-request-state.hpp b/src/requester-request-state.hpp
index fcda478..a6cfc1b 100644
--- a/src/requester-request-state.hpp
+++ b/src/requester-request-state.hpp
@@ -88,7 +88,7 @@
/**
* @brief AES key derived from the ecdh shared secret.
*/
- std::array<uint8_t, 16> m_aesKey = {0};
+ std::array<uint8_t, 16> m_aesKey = {{0}};
/**
* @brief The counter of AES blocks that have been encrypted.
*/
diff --git a/tests/unit-tests/ca-memory.t.cpp b/tests/unit-tests/ca-memory.t.cpp
index 4d6c9cc..c9d9f74 100644
--- a/tests/unit-tests/ca-memory.t.cpp
+++ b/tests/unit-tests/ca-memory.t.cpp
@@ -39,7 +39,7 @@
auto cert1 = key1.getDefaultCertificate();
// add operation
- RequestId requestId = {1,2,3,4,5,6,7,8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey1;
RequestState request1(Name("/ndn/site1"), requestId, RequestType::NEW,
Status::BEFORE_CHALLENGE, cert1, std::move(aesKey1));
@@ -70,7 +70,7 @@
auto identity2 = addIdentity(Name("/ndn/site2"));
auto key2 = identity2.getDefaultKey();
auto cert2 = key2.getDefaultCertificate();
- RequestId requestId2 = {8,7,6,5,4,3,2,1};
+ RequestId requestId2 = {{8,7,6,5,4,3,2,1}};
std::array<uint8_t, 16> aesKey3;
RequestState request3(Name("/ndn/site2"), requestId2, RequestType::NEW, Status::BEFORE_CHALLENGE,
cert2, std::move(aesKey3));
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index e76677f..bd6828d 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -467,7 +467,7 @@
signatureInfo.setValidityPeriod(security::ValidityPeriod(time::system_clock::now(),
time::system_clock::now() + time::hours(10)));
m_keyChain.sign(clientCert, signingByKey(clientKey.getName()).setSignatureInfo(signatureInfo));
- RequestId requestId = {1,2,3,4,5,6,7,8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
RequestState certRequest(Name("/ndn"), requestId, RequestType::NEW, Status::SUCCESS, clientCert, std::move(aesKey));
auto issuedCert = ca.issueCertificate(certRequest);
diff --git a/tests/unit-tests/ca-sqlite.t.cpp b/tests/unit-tests/ca-sqlite.t.cpp
index ee1a2c5..f609d4f 100644
--- a/tests/unit-tests/ca-sqlite.t.cpp
+++ b/tests/unit-tests/ca-sqlite.t.cpp
@@ -38,7 +38,7 @@
auto cert1 = key1.getDefaultCertificate();
// add operation
- RequestId requestId = {1,2,3,4,5,6,7,8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey1;
RequestState request1(Name("/ndn/site1"), requestId, RequestType::NEW, Status::BEFORE_CHALLENGE, cert1, std::move(aesKey1));
storage.addRequest(request1);
@@ -67,7 +67,7 @@
auto identity2 = addIdentity(Name("/ndn/site2"));
auto key2 = identity2.getDefaultKey();
auto cert2 = key2.getDefaultCertificate();
- RequestId requestId2 = {8,7,6,5,4,3,2,1};
+ RequestId requestId2 = {{8,7,6,5,4,3,2,1}};
std::array<uint8_t, 16> aesKey3;
RequestState request3(Name("/ndn/site2"), requestId2, RequestType::NEW,
Status::BEFORE_CHALLENGE, cert2, std::move(aesKey3));
@@ -95,7 +95,7 @@
auto cert1 = key1.getDefaultCertificate();
// add operation
- RequestId requestId = {1,2,3,4,5,6,7,8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
RequestState request1(Name("/ndn/site1"),requestId, RequestType::NEW,
Status::BEFORE_CHALLENGE, cert1, std::move(aesKey));
diff --git a/tests/unit-tests/challenge-credential.t.cpp b/tests/unit-tests/challenge-credential.t.cpp
index 38b77bb..04347ab 100644
--- a/tests/unit-tests/challenge-credential.t.cpp
+++ b/tests/unit-tests/challenge-credential.t.cpp
@@ -53,7 +53,7 @@
auto identityA = addIdentity(Name("/example"));
auto keyA = identityA.getDefaultKey();
auto certA = key.getDefaultCertificate();
- RequestId requestId = {1,2,3,4,5,6,7,8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState state(Name("/example"), requestId, RequestType::NEW,
Status::BEFORE_CHALLENGE, certA, std::move(aesKey));
diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index 5801bca..426ea03 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -45,7 +45,7 @@
auto identity = addIdentity(Name("/ndn/site1"));
auto key = identity.getDefaultKey();
auto cert = key.getDefaultCertificate();
- RequestId requestId = {1, 2, 3, 4, 5, 6, 7, 8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState request(Name("/ndn/site1"), requestId, RequestType::NEW, Status::BEFORE_CHALLENGE, cert, std::move(aesKey));
@@ -96,7 +96,7 @@
auto identity = addIdentity(Name("/ndn/site1"));
auto key = identity.getDefaultKey();
auto cert = key.getDefaultCertificate();
- RequestId requestId = {1, 2, 3, 4, 5, 6, 7, 8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState request(Name("/ndn/site1"), requestId, RequestType::NEW, Status::BEFORE_CHALLENGE, cert, std::move(aesKey));
@@ -119,7 +119,7 @@
auto cert = key.getDefaultCertificate();
JsonSection json;
json.put(ChallengeEmail::PARAMETER_KEY_CODE, "4567");
- RequestId requestId = {1, 2, 3, 4, 5, 6, 7, 8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState request(Name("/ndn/site1"), requestId, RequestType::NEW, Status::CHALLENGE, cert,
"email", ChallengeEmail::NEED_CODE, time::system_clock::now(),
@@ -143,7 +143,7 @@
auto cert = key.getDefaultCertificate();
JsonSection json;
json.put(ChallengeEmail::PARAMETER_KEY_CODE, "4567");
- RequestId requestId = {1, 2, 3, 4, 5, 6, 7, 8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState request(Name("/ndn/site1"), requestId, RequestType::NEW, Status::CHALLENGE, cert,
"email", ChallengeEmail::NEED_CODE, time::system_clock::now(),
diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index f790bad..4b87a1e 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -38,7 +38,7 @@
auto identity = addIdentity(Name("/ndn/site1"));
auto key = identity.getDefaultKey();
auto cert = key.getDefaultCertificate();
- RequestId requestId = {1, 2, 3, 4, 5, 6, 7, 8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState request(Name("/ndn/site1"), requestId, RequestType::NEW, Status::BEFORE_CHALLENGE, cert, std::move(aesKey));
@@ -57,7 +57,7 @@
auto cert = key.getDefaultCertificate();
JsonSection secret;
secret.add(ChallengePin::PARAMETER_KEY_CODE, "12345");
- RequestId requestId = {1, 2, 3, 4, 5, 6, 7, 8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState request(Name("/ndn/site1"), requestId, RequestType::NEW, Status::CHALLENGE, cert,
"pin", ChallengePin::NEED_CODE, time::system_clock::now(),
@@ -81,7 +81,7 @@
auto cert = key.getDefaultCertificate();
JsonSection secret;
secret.add(ChallengePin::PARAMETER_KEY_CODE, "12345");
- RequestId requestId = {1, 2, 3, 4, 5, 6, 7, 8};
+ RequestId requestId = {{1,2,3,4,5,6,7,8}};
std::array<uint8_t, 16> aesKey;
ca::RequestState request(Name("/ndn/site1"), requestId, RequestType::NEW, Status::CHALLENGE, cert,
"pin", ChallengePin::NEED_CODE, time::system_clock::now(),
diff --git a/tests/unit-tests/protocol-encoders.t.cpp b/tests/unit-tests/protocol-encoders.t.cpp
index 92e0e4d..b70ffa2 100644
--- a/tests/unit-tests/protocol-encoders.t.cpp
+++ b/tests/unit-tests/protocol-encoders.t.cpp
@@ -122,8 +122,8 @@
BOOST_AUTO_TEST_CASE(NewRevokeEncodingData)
{
std::vector<uint8_t> pub = ECDHState().getSelfPubKey();
- std::array<uint8_t, 32> salt = {101};
- RequestId id = {102};
+ std::array<uint8_t, 32> salt = {{101}};
+ RequestId id = {{102}};
std::list<std::string> list;
list.emplace_back("abc");
list.emplace_back("def");
@@ -146,7 +146,7 @@
requester::ProfileStorage caCache;
caCache.load("tests/unit-tests/config-files/config-client-1");
security::Certificate certRequest = *caCache.getCaItems().front().m_cert;
- RequestId id = {102};
+ RequestId id = {{102}};
std::array<uint8_t, 16> aesKey;
std::memcpy(aesKey.data(), key, sizeof(key));
ca::RequestState state(Name("/ndn/ucla"), id, RequestType::NEW, Status::PENDING,