commit ba3f689e2da59f6b1972309b423eba22c1753d53
author Davide Pesavento <davidepesa@gmail.com> Tue Dec 08 22:18:35 2020 -0500
committer Davide Pesavento <davidepesa@gmail.com> Wed Dec 09 14:37:43 2020 -0500
tree 4bf8be925c1cb6cf6f3566f63a68b97567f21a7e
parent dddc19aef4cb67df70f74395aa3e38c2a49c4f79

tests: sync common testing infrastructure with ndn-cxx

Also upgrade waf to version 2.0.21

Change-Id: Ifad909ca2f3463796d928b62f3131418b654446f

src/encryptor.cpp

diff --git a/src/encryptor.cpp b/src/encryptor.cpp
index 68ac6eb..efee391 100644
--- a/src/encryptor.cpp
+++ b/src/encryptor.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2019, Regents of the University of California
+ * Copyright (c) 2014-2020, Regents of the University of California
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -32,16 +32,16 @@
 Encryptor::Encryptor(const Name& accessPrefix,
                      const Name& ckPrefix, SigningInfo ckDataSigningInfo,
                      const ErrorCallback& onFailure,
-                     Validator& validator, KeyChain& keyChain, Face& face)
-  : m_accessPrefix{accessPrefix}
-  , m_ckPrefix{ckPrefix}
-  , m_ckBits{AES_KEY_SIZE}
-  , m_ckDataSigningInfo{std::move(ckDataSigningInfo)}
+                     Validator&, KeyChain& keyChain, Face& face)
+  : m_accessPrefix(accessPrefix)
+  , m_ckPrefix(ckPrefix)
+  , m_ckBits(AES_KEY_SIZE)
+  , m_ckDataSigningInfo(std::move(ckDataSigningInfo))
   , m_isKekRetrievalInProgress(false)
   , m_onFailure(onFailure)
-  , m_keyChain{keyChain}
-  , m_face{face}
-  , m_scheduler{face.getIoService()}
+  , m_keyChain(keyChain)
+  , m_face(face)
+  , m_scheduler(face.getIoService())
 {
   regenerateCk();
 
@@ -199,7 +199,8 @@
     return true;
   }
   catch (const std::runtime_error&) {
-    onFailure(ErrorCode::EncryptionFailure, "Failed to encrypt generated CK with KEK " + m_kek->getName().toUri());
+    onFailure(ErrorCode::EncryptionFailure,
+              "Failed to encrypt generated CK with KEK " + m_kek->getName().toUri());
     return false;
   }
 }